Can't offer any suggestions. I am just about in the same fix as you. My natural gas water heater is 16+ years old, but I see no signs predicting imminent failure. OTOH, it is 16+ years old, so for what should I be watching? I haven't a clue what to expect when it quits, so I'll be interested in this thread.