85 TD belt, pulley, water pump question

Hi, I have a 85 Jetta TD with AC / PS, and would like to go with a newer serpentine belt system, What would work? I know I'll need the AC compressor, brackets, idlers, etc. It looks like a 96-98 TDI would do it? Who has done this, and how? Artie

My AAZ engine has the alt and waterpump on a serp system. When I got it the thing also had another pulley with a V belt to run the power steering. Didn't come with AC so I don't know which type it would have ran but I would think on the serp system as the power steering V belt was the lowest belt. Hope that helps a little. Everything seems to be able to bolt on from the 1.6 to the 1.9 AAZ. I don't know about the TDI.