How about a tankless system? When our water heater gave up the ghost we went to a tankless system and it works quite well.

Our hot water lines were originally plumbed in the attic so we have the same surefire notification system of any problems....
_________________________
Geezer in Chief