H22 = too heavy for anything other than straightline driving IMO. A lot of people debate it - straight line = awesome, but it's a fair bit heavier than a B18 or B16 which are heavier than your original motor. B16a = good, but lacking in torque (even though that's what I have). B18C = good torque levels and power and a good starting poin to drop a turbo onto.
I'd have to say a B18 would be the best swap in.
Just my opinion though
