I went ahead and replaced the water pump, thermostat, radiator hoses, belt, idler pulley and tensioner. I figured it was a good time to get everything. I went with Gates for everything. They had a good kit at Rock Auto. The old pump seemed to be in decent condition. I set it on a shelf just...