Have you checked your cat? If it's clogged you might loose power. i was thinking since you failed inspection. Also I'd check the throttle body to see if the valves are opening correctly when you give it throttle. You might have a leak there too.
We took the whole intake off and replaced most of the hoses and cleaned out the intake manifold and stuff. Still idles a little rough, but nothing serious. We haven't replaced O2 sensor yet (heat and a 22mm wrench does the work for me with O2 sensors). Realoem.com is great for seeing how all the hoses and stuff is put together.
Since the Bentley manual doesn't cover the M42, does anyone know where to find DIY writeups for this engine?