Cheers Pleiades

No I didn't solder the kev mod. In fairness it was a struggle to get it screwed in. It's defiantly not the best connection but I've had a new headlight bulb put in and it works fine again.
I'll pass the info on to the garage and hopefully they can check those issues.
The bikes been charging fine and had no issues with starting it.
I'll keep the post updated if/when the garage finds the problem

Thanks