I re-wired my entire electrical system, all new wire, with Weatherpack male/female automotive connectors (2, 3, and 4 terminal)... I would start there if I were you... In my experience CDI's don't fail and still work... They usually just fail and thats it... Go to Harbor Freight and by the wire caddy they have, it has all the wire you'll need, and UAS (United Auto Supply) has the Weatherpack connectors..