Excellent post !
I just did this today, used 600 grit to clean contacts and
electrical cleaner to get out the gunk.
Also had to repair broken post on switch.
Used piano wire, carbon fiber tube, and epoxy to create new posts for switch.

__________________
80 300D 340K Owned 30 yrs
83 300SD 440K Owned 9 yrs - Daily Driver 150mi/day
02 Z71 Suburban 117,000
15 Toyota Prius 2600 miles
00 Harley Sportster 24k
09 Yamaha R6
03 Ninja 250