Lastly, to save energy on your existing water heater...

“Insulate the heater itself and the first 6 feet of pipes, both hot and cold.”

https://www.energysage.com/energy-efficiency/101/ways-to-save-energy/