GIT,
Did you ever decipher and repair your problem? My problem sounded pretty similar to yours.
I pulled off, cleaned, re-gasketed these items this past weekend:
EGR
IAC
TPS
TB
The only ones that I got anything off of were the TB and IAC.
I also replaced my fuel filter.
My problem seems to be fixed.
Good luck!