Wild Dog….Couple of things you should take note of. Reading up on your water heater it will operate better at 40 psi and above. Make sure the pump you select will give you the needed flow rate at those pressures to to comply with HD regs. You should also install valves on the inlet and outlet side of the pump for when you need to do routine service. Also install flexible tubing on both ports. Vibrations from the pump will cause the cpvc to crack over time if not used. Looking good so far and I wish you the best of luck getting going.