About a year ago, I bought and installed a tankless water heater. Had to replace some wiring and get a bigger breaker, but it supplies endless hot water at low cost.
Nothing to leak and it takes up about a square foot of room.
DonM