Not sure if this was said, but did you check your intake boots for cracks? And cleaning your MAF will only help if it functions properly. Once the MAF is bad it needs to be replaced. I always start with the cheapest things first, so check intake boots before anything.
2004 M3 Silver Grey / Imola Red