Go to a v-twin vender purchase a new harley style switch follow this diagram, and wire the puppy in a new location using the wiring for the old switch as a quick connect pig tail. Mount it just behind the oil tank on the leftside.
Leave the factory switch alone to use as a fork lock, and also it is not worth the time to remove.