I finally tracked down one of the only two Mk2 parts shop in the country today and got a new water pump and housing, plus new thermostat for slightly cheaper than it would have been ordering it online from the UK (and without the 1 month wait while it sits in customs.)
Thing is I had to buy the 2 parts separately, the pump is by febi-bilstein, the housing by Meyle. The all-in-one types were out of stock. Both come with a cardboard gasket to fit to the other half.
My question is this: Should I use one gasket plus gasket sealant; just the one cardboard gasket; both; or neither - just gasket sealant instead?
Have decided to leave the fuel filter until after my next salary, its all getting a bit pricey to replace everything in the first month!