FWIW looking at the corrosion of the red wires in your picture, you are likely to have corrosion in all the in-line connectors under the tank. I had good results with a small container (top off a spray can) of vinegar, remove the terminals from the connectors and submerge them in vinegar overnight (I used tape to hold the container to the bike and also to force the terminals to stay submerged). With additional help from a brass wire brush, you can make the terminals scrub-up very nicely indeed. Then reassemble with a light covering of (I use vaseline) some proprietary terminal grease.
Also, I would advise you return the wiring to standard (eg, don't test it with the main earth disconnected) as you will be chasing your tail with spurious faults.
Also, I would advise you return the wiring to standard (eg, don't test it with the main earth disconnected) as you will be chasing your tail with spurious faults.