i say swap in the b20 block its basically a bored b18 block so there is abit more torque and the head/tranny bolt right up its one of those things you kinda have to frankenstine togeather but in the end i think it would be best especially if you want to build it up at some point