Water pump change out is easy, but messy. I got 150K out of mine before the gasket failed. Pump was still good, just the gasket failed. Sounds like you found the problem though. Gauge is at normal position. Water Pump flow ? Two lines going into the heater core, one input, one output. Set heat to highest, set fan to high. Start engine. As engine warms up compare temps between the 2 heater core hoses. One should be significantly cooler than the other as the heater core bleeds heat from coolant, you may even be able to feel the flow with hand. When engine comes up to temp, you should be able to compare temps of the 2 core hoses and the upper radiator hose. The upper radiator and the core input line should be very close in temp, and the core output should feel cooler. Having an infrared temp gauge makes this easier and more accurate, although not really needed. Glad to hear your problem solved.