Why did you heat hot water?
Richard let me know when you are ready to attack your cold water heater. Our is not leaking but it is 16 years old and we are thinking of replacing it soon. Sounds like a good chance to help each other install new water heaters.