I'm leaning toward the killswitch on the handlebar. Because, with the CDI, Coils and plugwires under the tank, that is where water is most likely to accumulate when the bike is washed or in a heavy rain.
Also, the kickstand interlock switch might be suspect. I think it is tied to both the starter circuit and the ignition circuit. Someone with a wiring diagram will have to confirm that.
I've had issues with switches that have a rubber boot on them. Water will collect in the rubber boot and not drain out causing the tabs to short or loose connection with the wiring harness. That happened on my oil pressure sender and my rear brake switch.
Hope you guys get er goin real soon.