I dis-assembled all the wires to that soldered junction and attached them to a terminal strip, then I used jumpers to power the wires to each load.
Here's a picture
.
I haven't completed it yet, still have to wire the cooling fan and a few things to clean up the wiring.
I decided that you will be OK with the relay breakers if you shut the headlight switch off as soon as they start breaking.