We'll see if I made a mistake, but I'm replacing the blade quick connectors with all Deutsch style connectors. Something that is waterproof, easy to find, and makes a good secure connection.
I'll have to do extensive rewiring at the panel, but the original harness was shot to pieces anyway. I was not expecting to find any, but these are all rated for 14 gauge wire - more than enough.