Maybe try a tankless heater. It requires a small investment, but it does pay off in a few years.