A few comments on this job: Tedious with hard to access bolts. Expensive parts. Make sure to replace your main seals. I did a related job last night, air pump and sas valve. Easy job, but again, expensive parts. I don't know if other cars are as complex with the emissions related systems, but it is ...
Try pulling the MAF sensor out to hang free and drive around town very easy for 10 minutes. If the symptoms don't show up, clean the MAF sensor with electrical contact cleaner and hopefully that solves the problem.