You can check the water pump by taking off the serpentine belt and spinning the pulley on the water pump, if it has any play in it is time for a new one. Shoulda just replaced that while you were doing the coolant elbows. They're relatively inexpensive depending on where you buy them.