If you ever suspect the MAF sensor then with the engine running just disconnect the electrics and see what happens. The ECU will let the engine run in default mode and although it will only have basic adjustment it should run smooth.