Nice job possum,did the right thing. In a case like that the best thing to do is start from scratch. Last year i brought a new 30 amp circuit up to a buss fuse block,soldered all connections and put on an anticorrosion lube on them and liquid tape them. Hopefully no water will get in those joints. All my circuits are operable now but need to replace circuits a little at a time. Mines an '83 always something to do on these oldies butt goodies. good luck!
