Best thing to do is invest the money in a quality tankless water heater, the way the energy guidelines keep changing, you can replace a water heater every 6-10 years or invest in one you'll never have to change, requires little to no maintenance, you'll never have a lack of hot water or pressure drop due to the nature of a traditional tankless water heater that if you do not set up properly, have flushed annually, you will clog the heat exchanger and be out a lot of money for a short term fix. For what it's worth, don't look at any issue with you home as an expense, rather an investment, it can resell itself if you're truly going to move.