I believe there is a TSB on these codes for this engine that tells how to reset the baro correctly. It is number 98-10-1. I think your MAF diagnosis was correct, you just have to get the baro right now. Look up that bulletin to get it set right. Login to read more.