I found it easy to rewire from scratch. This means that you can use 4mm wire for all applications and 6mm for headlights. You can solder all your connections to reduce voltage drop as well as soldering in fusible links on the supply side of the headlight / high beam relays. It also means that you can choose the type of fuses / relays you want to use and their location. You can color code in colors that are easy to remember.
The easiest way is to just wire each component, one at a time, then gather the wires together to form a loom. 7 core trailer loom is handy for addressing all the power needs to the rear of the vehicle.

