Originally Posted by Ninjakitty
A few suggestions.
On city water in a strainer and PRV pressure reducing valve is highly recommended.
A seperate water feed to fill the tank can be used off of the city water with a hand valve to control it.
Only one check valve on the leaving side of the pump is needed and one on the water heater entering side.
I like to install shutoff/hand valves on both side of each piece of equipment so that what water is in that piece is all that is lost when it has to be worked on.
Hope this helps