Finally made all the connections in the headlamp shell and refitted the headlamp.
Then I removed the 2 alloy plates under the seat where the electrical boxes are fixed.
These got painted up and the boxes refitted.
Tomorrow I will refit the plates and tidy up the wiring in that area.
Then on to timing the engine and ignition.