The Rooted Handlebar switch problem child blinkers have stopped working, sussed out that 2 wires have become unsoldered from there terminals and probably not repairable (by me anyway) someone has previously been in here and soldered the same 2 wire so wires are all stiff with blobby bits of solder remaining. So my question is, will an xs 650 switchblock fit straight in? GeoffsXS has some new ones but photo on the website doesnt show the connectors to good