fe400e wiring mess

I recently bought a 98fe400e with a baja designs kit. It all works fine but the wiring under the seat is a rats nest of wires running every direction. This will not do. Also, there is no key for the bike, just a plunger switch mounted inside the subframe. I'd like to clean up the wiring and remove the plunger and add a keyed switch up next to the speedometer. I was just going to do a direct replacement of the plunger for a keyed switch. It looks like plunger only breaks contact for one wire. Somehow this does not seem right to me. A regular ignition switch breaks contact for more than one wire. I guess my question is, does anyone see a problem with this and what really needs to be activated by a keyed switch.

Thanks,

Roger

Brad,

Thanks for the diagrams and information, gives me a map to sort the mess out. I looked at your gallery pics, nice sidestand mod. I'll need to do the same or similar as my sidestand bracket is cracked.

Roger