G'day again Bondy and Mark,
Sorry Bondy, the BLACK wire from the solenoid to the S terminal of the switch. My defence is that it was 3am

I agree Mark. I hadn't planned on discussing charging until it was starting either but Bondy asked about the charge wire. If you agree that the charge wire should go direct to the solenoid battery post and doesn't need to be fused then it's just as easy to do it now?
Bondy, can I suggest you send a bunch more photos of you finished wiring before you power up.