Lonnie, If you still have the heater apart, look at the control valve diaphragm real close under a magnifying glass.
How old is it? If you see any cracks in the rubber, I'd repair it.
This is what failed on mine even after I tested it, I didn't see the cracks. It could also have been the source of your drips, even though the pipes were suspect.
