afaik....least Im hoping as that's what im changin mine too 
Im also upgrading to mk3 fronts n rears (least thats the plan but when do things go to plan?)
Dinx 
Convinced now. New MK2 GTi servo and MS followed by a good system bleeding all round and then some calipers from a MK2 on the front. Maybe a MK3.....
So many things to consider.
!m!