I'm pretty sure there aren't any shorts, and the switch doesn't seem to have any effect. I think I'm just going to go back to the 10K mod until I can get a circuit board and some some plugs so I just disconnect the stock plug and plug it into the new one.
Thanks again for all your help!!