I had almost the exact some problem. Cleaning the MAF sensor didn't fix it. Replacing it did, however.