Just to follow up. I shouldn't have tried to change so many parts at once. Turns out spraying out the secondary MAF didn't work (even though it looked fine). I put in a new MAF sensor but when I added the aftermarket secondary smog pump it made things worse. I think I found an OEM Pierburg pump online for $200 but turns out I didn't need it. I removed the RockAuto pump and put back in the one that was in the car when I started and all the codes went away and stayed away (have 500+ miles on it now and no codes). Lesson learned. Thanks for the help.