By the way, here is a complete write up on how to do this swap:
http://www.geocities.com/celicasleeper/writeup.html

How about buying a nicer shell with a fresh 4AFE in it as a spare engine?