What I think would help you greatly is to get rid of all the galvanized and use a regular brass tank tee and add a relief drain valves to it. And a pressure gauge if you don't have one now (I can't see the picture while replying).
The T/P valve on teh heater won't open based on your pump's maximum pressure.
Then get a correctly sized softener with a Clack WS-1 for the proper constant SFR (service flow rate) gpm required based on the number of people in the family, the number of bathrooms and the type of fixtures in them. A softener will protect the new water heater from hard water scale build up, which will extend the life of the heater and reduce your cost to heat water.