How much is it going to cost you to rebuild the 99 motor? New short block can be had for around $2k now so even if it is $500 for airfreight it's still good bang for buck.

The 94 heads will bolt onto any EJ engine afaik.