Which Timing Belt Tensioner

[Mark S]

Running an AAZ (engine out of 1996 Golf, I was told by the supplier). Am about to replace timing belt (incl tensioner) as engine is approaching an estimated 60K miles.

Have seen conflicting information on which tensioner I should be using. Some suppliers seem to indicate 028109243E for a certain generation of engines and 028109243F for another. Then other suppliers lump the two together in their catalogue as though the parts are now interchangeable (or maybe 'F' superseded 'E'). I notice Guenzl sells 'E' for AAZ and 'F' for JX!).

Can anyone shed any light on this? Do I need to dig out the engine number to inform the decision, or is there a current version that we should all now be using regardless?

Also, on a slightly different topic: I also have an Audi A4 and with that VAG advocate replacing the water pump at the same time as replacing the cam belt. I assume this is because water pumps are now mostly driven off the cam belt whereas previously they were off the aux belt (as is the case with the AAZ in my bus). My Haynes manual for the Mk3 Golf does not specify replacing the pump at any particular service interval. Is (a) replacing the water pump at the same time as the cam belt recommended on the AAZ; or (b) is this something I should be considering round about now but it can be done easily independently of the cam belt change; or (c) something not worth bothering with until a problem starts to appear (none has so far)?

Many thanks.