I don't do the water pump with the cambelt, never had one fail on an mk3 and it doesn't need the belt off to replace (then again I'm from Yorkshire so spending money is bad!)
but as said get all the belts swapped over as they really need to come off to sort the cambelt