Had a the same on mine at Portimao. Removed one of the shims from the ign pick up sensor. All ok after that.
Just read your original post again. Mine was totally cutting out, then cutting in again. Sounds different to the problems you are having, sorry
