Problem solved, it was the coil/cap/rotor. I pulled them off and they all looked like death warmed over (the rotor was wobbling) and now it runs perfect, better than it did when I bought it, and I thought it sounded good then.

Thanks for your help,
Mark