Great car, a nice mk2 2 is definately at the top of the next car list.
Quick question, was the inlet manifold a straight swap? There seem to be plenty on eBay (with throttle bodies) for reasonable money but I can't find any guides for swapping them over.