Ah, well, still sounds like some loose wiring in there. It's all color coded so should be easy enough to resolve.

BTW, what octane are you using?

STarting with the MAF is a solid measure. Baby steps towards a solution. God knows, I am in need of a new EGR. Even after taking it out twice and cleaning it up real well, it still ends up looking like it came out of a 50 year old car.