Motorcycle advice needed

My poor motorcycle. It seems like every day it has a new woe. A few days ago on the way to St Petersburg, FL the speedometer/mileage counter guage went out. It just decided not to work anymore. It gets power (the light inside of it still, to my amazement, lights up) but the dials don’t move. This is exceedingly unfortunate because my Honda doesn’t have a gas guage. I’ve been refueling every 160-ish miles. I can manage it with the GPS but that’s not my major worry. I just wonder what’s going to be next.
But there is something one of you might be able to help with. A few weeks ago I had a complete electrical system crash resulting in me rigging my bike to work around the ignition key (shhh, don’t tell any thieves who specialize in road scarred $300 bikes). This has been fine for the most part except I have no power to my running lights. To get around this problem I’ve tried to keep the bike parked when it’s dark but that’s not always possible. I found a wiring schematic online here but I’m not sure which wires needed to be crossed in what order. This is where I need an electrician’s advice. I have the red and black wire crossed on the ignition switch (left side, halfway up in pic) and I think if I just cross the brown wire with the black in my ghetto rigged switch it should work when the red closes the circuit through the switch. Right?