They should be able to tell you which motor to get.Just make sure that you get the motor with the hydraulic transmission.The b16 should be 92+ and the b18b should be 94+ i beleive.So you will be looking to get a b16a2/3 or the b18b1 i beleive...
IMO i would go with the b18b1...