I'm going to write all that down. Like i said before, mine may be due in the next few years also. A bigger tank is definitely on my list. I'd probably even save money that way, because I could turn the temp down and still be able to take long showers.