I have a B7 2.0 that seems to do the same thing. I thought it was the Diverter, replaced it, power is back but it does a weird lag, then over rev for a 1000 RPM before settling while at mid to full throttle. I have a FWD, 6 spd manual. Could this be a similar problem?