b) Replace the female connector on the main harness with the new style directly - 8-Way Kit (get largest terminals and seals)
As mentioned earlier you should definitely look to a headlight-key-switch-bypass mod or it will surely happen again; this is the simplest way to achieve that with a single relay - New member in Japan: 30A fuse blowing (horn, turn signals)
When I first came on forum i too had a key switch issue and found guys had fixed wire, installed a 40.00 keyless directions in signature of idk, the guard dawg but many were recommending the decosse system as being the shiz nit, I like shiz nit, and I’m glad I listened itsplug ang play professionally made with customer service that is incredible. Get the best once if you can and be done with it as the ignition switch can be an issue for some,