Alright, here's my current situation:
90 CRX Si, D16A6, stock
I'm procuring a D15B7 block with a Z6 head, pnp'd, 3 angle valve job, no cam\valves\intake mani (timing belt snapped). It has also an oil pump modified per ENDYN's suggestions and a water pump modified in the same way for an A6...