I found that after you get the switch all apart it helps to flush the body out with electrical contact cleaner, it removes a lot of little crud. The best thing I found for cleaning the contact faces is a pencil eraser and when you put it back together use a small dab of dielectric grease to hold things in place during reassembly.
My two cents.

__________________
1983 300SD
200000miles