You've done more on yours since you had it than I have done on mine in the last 2 years!! Man I'm a lazy ass. The problem your having sounds like an electrical one too me. Like you say there is a shit load of things it could be. At least you have the winter to sort it out. In my expeariance with FC's it tends to be a couple of problems that make one bigger fault. Fuel pump wiring, poor earths coil packs ect are all good places to start.