My Famous JAMES: Slow progress

I've now removed all the reinforced duct tape from the wiring harness, which was hidden from view under the very visible red or black (or both) insulating tape. The bike has been rewired at some (or various) point in its life, using original style connectors, those nasty hard insulated crimped on connectors and the twisted wire method, both with and without solder. It did work. I did have lights, front and rear, high, low, side, brake, the lot. The horn worked, sort of, and there was a spark.

But, trying to follow the factory wiring diagram against the work done is not an easy task. It does not now use the original colour scheme, in fact, in places....... it matters not, It can't remain like this.

There are a few choices open to me.
1. Try and figure out what's been already done and improve the existing harness. Standardize the connectors, remove the excess wire and at least get some sort of schematic I can follow.

2. I could start from scratch following the factory diagram after ordering all the correct wire and connecters. I've already admitted, electrics are not a strong point, but I can solder, I can read a diagram and with all the components in place it's doable.
3. I could pay someone to rewire the bike, I've no idea on costs, but it wont be cheap, or
4. I find Catmando Services who will make a loom for £70 specifically for the Commodore.

I'll ponder, but it's between buying a new harness or making my own.

My chemistry experiment is being conducted as I type. I was worried that my charger would supply any power. As with most chargers now it's a conditioner, fully digital and struggles with completely flat batteries.