are you still running an oem paper air foleter or do you have a K&N/intake setup.
ive seen filthy sensor elements cause correlation/diagnostic failures in the limp modes.
please also confirm that both map sensors have the same 2 bar part numbers. ivee seen "swap with known good" diagnostics that end up with a 1 bar swapped on and since it didnt change anything they didnt swap back....