Check the water pump bearing while your in there and make sure it isn't seizing.
I had my water pump freeze up two summers ago. The bearings in the tensioner were also replaced. There are two bearings in the water pump belt tensioner separated by a snap ring. My vehicle is an '87 328.