RE: Waterpump replacement
Funny this should come up now, I just had to have the water pump replaced on
my 2.1L last Tuesday, in the middle of a two week trip no less (I was
carrying a spare).  The work was done by a very competent mechanic that
knows VWs better than 90% of the mechanics out there.  He noted in the
process that whoever had done the previous water pump install had over
torqued one of the pulley bolts (took an air hammer to get it out) and one
of the hex screws.  So running into hard to rempve water pumps is not a
unique experience.
BTW, it was a treat to watch someone that knew exactly what he was doing do
a job like that.  And he did such a good job bleeding the cooling system
that for the rest of the trip I was running slightly cooler and more
consistent temperatures than I have in the past.