Your symptoms sound a lot like the ones I am battling right now as well - you might want to check out my thread "Bike back from 12K service - now dies sporatically" for some ideas. Have you had any work done recently or made any other adjustments lately?
