Ug...

Is there any possibility to the flakey on/off switch idea? I have a feeling no matter what I should resolder but I'm wondering if I should circumvent the on/off switch while I'm at it?

Thanks for your help.