Try driving with a disconnected MAF to see if you still get thew RPM hickups?

Also, pretty rare, but PCM might be bad.