imo, b18c5.
simple swap, lots of power, high redline, lsd, higher compression, friction coated internals, better flowing intake manifold... blah blah blah.
well thats at least what im doing. imo, its worth the extra 1500$ over the b18c1 and the hassel involved with an h22 swap. but since you want to go FI i guess the b16 or h22 would do you better.
only reason im planning on going c5 is because i want to stay na, want to auto-x, and want a red valve cover