Without changing the coil/gap and with just changing the CDI, the problem goes away. I highly doubt it's the pickup coil/gap.

"Never underestimate the power of human stupidity" - Robert Heinlein