I'm having sort of the same problem but I took it to the shop and they said they gotta change the ignitor, ignition coil, cap and rotor too. I'm still deciding whether to go through with it or do it myself.