Mine has the ignition switch relocated to the left side below the seat. The wiring looks to be fine. I've never had an ignition switch related problem, only a starter solenoid problem.I did not want to have one either, so i did the EB. I did order the Toyota starter, and should have it by Friday. My starter is shot. Sounds like it is full of gravel, draws current like mad, and occasionally smells like the windings are burning off their insul. It did this slowly, as if there was a bad spot, sometimes it would whip the motor over, and other times really labor to crank.
Now, it labors all the time. I have parked it. At least I have other bikes to ride. I would go nuts without a bike this time of year.