If i was you i would deal with one problem at a time,get your charging sorted out, then move on to ignition. Mr 67dart273 has explained everything in detail,something that took a great deal of time and thought. If this is above your pay scale maybe there is someone that can help you sort it out. Guy that set up the one wire deal overlooked something, and for all the trouble now,returning to stock seems the best plan.
The two spade (brush)terminals can be connected either way.
