I've read the whole thread and all I can say is to use the IDS and gather the data for the fuel trims at idle, 1500 and 2500 rpm and see what they are.

The two codes are possibly and quite likely related. Most likely it could be the MAF, however without know... Login to read more.