Featured Speedmaster Stalling/cutting Out, Running Rough.

Hi folks, so my first and main issue with my new 2004 Speedmaster, is that it started to cut out, when warm, and then got progressively worse.
I replaced the pick up sensor as advised, and sorted the gap to the 0.6-0.8mm, which appeared to sort out my problem for about 2 weeks, but then it got worse, and seemed to be running on one cylinder, unless I had the start choke pulled out and it would be ok when cruising, but when that went back in it went back down to one cylinder, and would stall at low speeds, or stopped.
So I chucked some money at it and bought the TTP fire starter CDI, with the extras, relays, leads plugs, I just bit the bullet. and yay, after a couple of hours of work, it runs like a dream, and appears to have sorted the problem.
The CDI was quite corroded at the attachment points, and needed some serious effort to get it removed from its bracket, and the tank removal that was recommended, wasn't really necessary, I just moved it out of the way, but carefully, so as not to disturb the hose, to do each side.
See you out there.