Before doing anything, if you haven't already, spray the switch with some good contact cleaner. You may just have dirty contacts. I've found that spraying cleaner cures alot of these types of problems without even taking something appart. I'm not saying that will take care of it, but might as well try.