RE: connectors
I'm with David, it doesn't look good around that switch.
The quality of crimp connectors varies widely. I prefer the ones that are totally encased in plastic, preferably made by Wurth. And use a good quality crimper, not a dollar-store model. The crimps will last forever, and no, you don't need to buy a ratchet crimper.