Any D-series motor should fit in your car with no modifications. Although, you may hurt its resale value if you substitute a USDM D15B(?). So unless the shop has a JDM D15B, I'd still try and find another D16Z6.

::Thinks for a moment::

Unless there's a USDM D15 that *doesn't* suck that I'm forgetting...