The problem came back when I tried to drive home tonight. I picked up the replacement MAF sensor that I ordered. I left the battery disconnected while I swapped it out to reset the computer.
No difference with the new MAF sensor.
After narrowing everything down, I'm thinking it almost has to be a vacuum leak, but I don't have any good way to test it. Any suggestions?