mk2 22mm MC & servo is a good upgrade, only issue is it only has 4 connections and the MK1 sometimes has 6! If you get some brake line combiners off a MK2 you can use these to put the brake light switches in the lines somewhere

However MK2 16v front brakes wont swap straight on, you have several options:
1. Older audi 256mm calipers & carriers, hard to find though!
2. Vauxhaul 256+ front calipers, boilt straight on. You need vaux pads, brake flexis and longer bolts. However the bolt holes are bigger so you either need shouldered bolts, or a slieve to take the diameter down to the size of the MK1 caliper bolt thread.
3. Caliper adaptor plates, TSR used to do these and you do see them around from time to time. These allow you to fit bigger discs using your old calipers
