David- I would check the smog laws before you start. I think in CA if your car doesn't have an engine that was originally offered in the production year it will not pass, even if it runs "cleaner". Just a thought. I would hate to see you waste your time, money, and car only to find out after the fact.
