Hello,
I got the same problem. I took it to a dealer here in Southfield MI and they told me that the knock sensors along with the MAF is bad.
I cleaned the MAF and the problem came back so I think it is the knock sensor. It is interesting you mentioned O2 sensor..
If you got a response, please share. Thanks in advance.