Taking the switch apart and spraying contact cleaner on the contacts seems to have taken care of my problem. It's very easy to pull out and take apart with a small flathead screwdriver. I also cleaned the lightbulb socket, so it's possible that was the culprit. Thanks!