If it was his MAf, he would be able to get the rpm's over 3,000. Im putting my money on the intake air temp sensor. The one you removed when you took out the lower snorkel that goes from the stock air box down into the silencer in the wheel well.
To fix the problem. just take that sensor and stick it in the hole in the fender, down into the wheel well.
But like Wes, said and pull the code just to be sure.
I did a write up and its stickied at the top of the b14 section. Check it out, has instruction on how to do it, pictures on what to do, and discriptions on each error code.