Engine stutter between 2.5 to 3k rpm

I am having a bit of bother with my 04 E46 M3

She has a engine stutter between 2.5k and 3k Rpm. In most cases she is absolutely fine outside of this

However on two occasions the engine warning light has come on and she stutters through the whole Rev range for a few moments, then the engine lights goes of and I am back in business.

I am thinking MAF???

Any suggestions???

To test the MAF, disconnect it. The car can run fine without it, just not as efficiently. If it runs well without it, then it's the MAF, if not, it's time to dig a little deeper. I'd get a smoke test done at a workshop to see if you have any perished hoses. Did mine the world of good when I found 3 hoses needing replacing.