look if you had problems with the switch before, what on earth did you expect ?...that after a paint job it would go away?....can you say.....Cole-herse?...they make new switches and should be availiable at your local Advance or Auto-zone....$30.00 bucks ?....
I try to live by the saying, if it's not broke don't try to fix it !
The headlight switch appears to be operating, as the headlights are working okay, but maybe a contact has gone bad?

Thanks for the help LT1S10, I will try to jumper the wires when I get home from work. Should have thought of that...