I agree with Ed. There are a lot of things to test. I think you are starting with the most expensive troubleshooting test first. Hopefully it pays off.
If you still have the problem after installing the new CDI, you'll be able to sell it off with no problem.
