The person to sort your problems is
www.towzatronics.co.uk
His name is Neil and he is a genius on bike electrics. He is a keen biker and has eight bikes in his shed. I can also guarantee that he wont rip you off or stick to the charges on his website.
There is the obvious issue of the distance although he has a van full of gear and travels all over the place. Or if you have a trailer or van he will repair at his house in Nottingham (maybe the same day)
I had a similar problem with a bike which was in a total mess and he sorted the lot in two hours and charged me £45 including a 50 mile round trip to my house and rewire of all the switchgear !!!!!