Very good advice from Warthog. I'd also recommend removing the wiring harness @ the firewall & clean out the connections on both sides. Mine were covered in a black goo, that I can only guess to be old, burnt, dirty, decrepit dielectric grease.
Electrical contact cleaner is a great thing!