P1345, P1348

[DanSanDiego]

Hi, I've read through the threads on P1345 and P1348 but never seem to see a resolution. Here is my situation: I get P1345 instantly and when I clear it I get it again within 30 seconds. I only get P1348 when I drive the X5. (3.0i, 2003) above 40mph.
So far I have changed the spark plug (#2 from the front) and the coil (#2 from the front). I have also removed and checked the intake boot for leaks (while doing this I cleaned the IAC). I also cleaned the MAF. When I remove the engine oil cap it only has normal (minimal) vacuum).
Any advise on what is wrong with my X5?
Symptoms are that the X5 pulses or surges when idling (or in park). It runs rough. It has lower power than usual when going up slight hills.