Also, how old is the water heater? If it's much past 10 years, since
it's located in the attic where the potential for disaster is high and
your already seeing indications of advanced corrosion on some of the
parts, I'd get a new one.