Update, went back out and cleaned Maf sensor and throttle body with intake cleaner. Seems to have resolved the issue. Never cleaned the throttle body before. 220000 miles of gunk must have caused the plate to stick a bit, throwing the computer off. Took it out on the highway and seems to idle normal...