This may not be related - but check to see that you don't have any plastic wire insulation touching the metal on the switch. I had smoke under my dash and thought a switch was bad, turns out I had used one of those crimp on connectors and had bent it by accident. The plastic touched metal, melted and caused smoke.
