First gen b16a swap and then mod the heck out of it. That would be my choice.
On another note:
I am selling my ZC to shawn also known as sastanley on this board. I am going the same route as you are with the b16 except I am not going to have any money left to mod the motor after I am done.

Oh well but 160 hp and 111 lb-ft is not too bad, especially in my grocery getter.