Slowly but surely the last bits are coming together...
Received my navigation gear, will install next week.
Rockfox Trip (with wheel pickup), CAP (with GPS) and Roadbook.
Trip and CAP run the same software, so if I wish to I can add a wheel pickup to CAP and GPS to Trip for full redundancy.
Thanks for this Adie and Mike, really a pleasure dealing with you, two real gentlemen 

Chris from Flying Brick gave me an LED strobe for my brake light -
thanks Chris 

Still to do...
- Have a bash plate with 2l water capability fabricated (starting on that next week)
- Find a suitable small tail pack to mount on rear fender for tools
- Fit the new tyres
- To be continued...