Have you looked into a tankless? Around $600-1000, but much more
efficient - you don't have a bunch of water just sitting there warm
most of the time. Then it's unlimited hot water when you do use it.
Something to think about.
Andy