Sweet little bike, sorry to hear about the wiring tho, on my XJ I just took the whole loom off and worked my way around till I found the fault, not for the faint of heart, if I might suggest something tho, do one small section at a time don't try to look at all the connections as this get's confusing, follow one connector at a time end to end then mark it off and go on to the next one,. boring and time consuming but worth it in the end. Good luck.