While you have the front of the engine torn down, I would also recommend changing the water pump.