Happy to read that you have fixed the...
problem. While you are "in the mood", you may want to plan to change the O2 sensors as they are getting to the end of their life expectancy.
Coincidentally, this same discussion is going on-on the Z8 forum and on of the M5 forums.
Scott Pettit