Ok given your background of a HP whoreI would do the 1.8 swap. I say this because the 1.8 motor has a larger following in the aftermarket world. I would look for a low milage 99-00 motor as it has a better head and intake design. If you keep your eye out you can get a good deal on one if you watch for them. I managed to snag a 94 1.8 for $100 that was complete. I don't know how much he wants for it, but Gaty has a wrecked 99 with a FM II turbo already on it. Depending on price this may be something to consider and just upgrading with some of the turbo parts from Corky's kit.