Have you cleaned the ICV? Yeah, it's not easy to get to on the M50. But it's very easy to clean and should be cleaned periodically anyways.

Though it still sounds like either a bad MAF or another vac leak. Would guess the MAF more though since you say unplugging it instantly fixes the problem. There someone around with a known good MAF you can try swapping in to test it out with?