[Vwdiesel] advice needed on parts source, 1.9 td, water pump

[raymond]

i'm not sure of the origins of the this motor, it was in a 91 jetta, a gas to diesel conversionthat i drove for years. i set the car aside for about a year, when i swapped the motor into a passatwagon i noticed the bearing noise that i could not locate though i drove it knowing the oil pressure and engine temp weregood. several months go by and the noise did show itself as a water pump: wobbly pulley, leaking. 
i am wondering which to use, i have the time to order something from autohauz or is there a local source (autozone etc) that may provide a reliable pump. also, any suggestions on a thermostat brand/temp to use. 
i will recheck the engine id to be sure 
ray