Shouldnt you already have a d16y8 in it? B18C would require no further modifications to get you to your goal, but the motor is around $1000 more than a b16a. With that money you can just get a B16A and put $1000 in mods on it.

I personally want to go with B16 cause of the larger aftermarket support.