For anyone that is following, ugh. My engine was fine for a few days, then the old damn light shot back on. So perhaps my rough cleaning of the MAF did not do the trick, maybe it's blown, maybe it's defective. But I can't get over the fact that the symptoms point to a bad intake issue, that my air filter was filthy, that my MAF was dirty...so I went ahead and ordered a brand new one for ~$250 from oembimmerparts.com. If this fails, I'll pay the Indy guy for a CCV.
In other news, climate control issues, which I'll start another thread on. Actually made me check the kbb.com value of this beast to see what I could get on a trade in. Nothing is better than spending a few hours and fixing a problem yourself, but nothing is more frustrating than spending a few hours and being back where you started. Updates to come.
Past ownership: 1987 325is, 1988 325i, 1995 325is, 1996 325i Convertible, 1994 325is black coupe (which I miss).
Current ownership: 2002 330i Sedan with some cool DINAN upgrades, 2006 X3 3.0i