I have thought a bit more on your riddle. Highly unlikely to be the water pump, but it could be a hose issue?

You might try pulling the hoses off of the heater and hooking it up to a hot water hose. Then you could do two things: verify the flow through the h... Login to read more.