New water heater install

Looking for recommendations on water supply hookups. I see my existing water heater was not installed with a 6 inch heat trap. Should I install a few more 90 degree fittings and make a 6 inch heat trap on both hot and cold with a 12 inch solid brass flex hose to the tank? Here is a pic of my old system.

flex lines are good .....

you can buy some flex lines that would
attach to the nipples on top the water heater
and do the work that way if you so choose....


but most water heaters today come with some sort of
heat trap already built into the nopples on top
the heater...

You just need a new water heater.

Heat traps are normaly installed at the factory or come with the heater to be installed.

You may need an expansion tank if you have a PRV and /or a check valve.