I suppose I could have started this thread with what has worked for me to date.
I didn’t shorten any of the original wires to give me flexibility for the future. Now the future is here.
Photos below so the wire connecting to the dyno on the right hand side, wrapping around the fork held in place by both gorilla tape and 2x cable ties and then routed to the light itself.
The wire for the rear has 2 connectors close to the headlight. I opted to wrap around the headset, go down along the top tube and then travel the length of my carrier to the rear. All of this is with gorilla tape.
As I said, functional but not pretty. I’d even go so far as to call it an eye sore.