Ed,
You're mods sound good. A fresh 2.0 will probably be a nice improvement too. If you are not already doing so, I suggest you visit the Type IV Forum at:
http://shoptalkforums.com/
Lots of good info for T4 fans. The upgrade of 1.7 and 1.8 to 2.0 has been discussed many times. Good luck.
Mike