if you decide to start purchasing new components for the electrical system i'll give you my 2 cents worth. when i replaced all mine (cdi, coil, plug, etc.) i bought an "aftermarket CDI which looked the same as mine. i screwed around with it for a week because it would not run right or shut of by the kill switch. i found out that the OEM CDI is different somehow. i guess my point is.....not all parts are created equal and you get what you pay for. the aftermarket cdi was half the price but double the trouble. i personally stay with oem electrical parts if i can. the non-electrical aftermarket parts are no problem but i'm no wizzard when it comes to figuring out the electrical stuff so i buy genuine to save me headaches....
