I would remove the fan and clutch. I did just that to my TD last month. I picked up a $17 fan switch at autozone and hooked it up to the brown wires on the a/c dryer. Now if my motor happens to heat up in trafic then the electric fan kicks on and keeps it cool. This will only work until it gets hot out but i am in the process of doing a dual electric fan setup.

__________________
82 Rabbit diesel (first d), 84 Jetta turbo d (300k when sold), 83 240d (305k when sold), 84 F250 6.9d w/Banks turbo(parts truck), 86 F250 6 cyl.gasser(waiting for 6.9d), 84 300d ( 347k Sold 8/04), Y2k New Bettle TDI (185k miles), 95 740IL (wifes), 87 300TD (206k Sold 7/05), 05 Passat TDI Wagon