[...trimmed text...]

I would definitely look at the MAF first. You might want to try to force a BARO update by performing 3 or 4 heavy sustained accelerations at greater then half throttle. According to TSB 98-23-10 this... Login to read more.