xt 350 intermittant electrical fault

Hi all,

i'm a bit stuck with a fault on my xt350. Its recently been put back on the road having been laid up for a few years. It ran fine for a couple of weeks and suddenly developed a bad missfire and hesitation which occassionaly clears and the bike goes like a rocket for a few miles before missbehaving again. I've made sure the carb is spotless, its had a new plug, i've tried a different coil, all the wiring has been thoroughly checked for shorts/ breaks/ bad earths. I think i've narrowed it down to an electrical component breaking down but im not sure what to do next. Im guessing the CDI or stator/ pickup may be faulty but i'd like to hear a few other opinions before i start wasting loads of money! any input greatly appreciated. Tom.