definately go with b16, more HP base and if you want to boost it later on it can be done. its not hard to boost the b16, you just need a good engine management setup when you do it and have it tuned.