I added grounding straps all around the other day, so I'm still thinking it's the switch.