I had the same codes, plus 2 others which are related. So far i've replaced 02 sensor and one of the plug coil. CEL is gone now but once awhile it'll jump into failsafe mode stuck in 3rd gear without CEL. next on the list will be (taking cues from this thread) fuel filter, PCV valve, valve cover gasket.
On a side note, i've also got an oil catch can installed routed from the PCV. would this somehow messes the AF mixture ever so slightly? btw my car doesnt use MAF sensor rather rely on MAP instead for determining air volume