Stage 1 is now complete - she's back on the road and rideable!
The overflow bottle is a bit dodgy, but I'll replace the zip ties with either pipe clamps or a custom bracket. I need to fiddle with the lights a bit to get the angle right, and the "elliptical" beam takes a bit of getting used to. But she lives! Fun to ride, too.