I'm having a problem with my 1.9 cdti on a 54 reg.

Recently had a problem with it where it started fine but wouldnt drive. Relayed to the garage and they said it was the EGR valve stuck open and replaced. The garage said there may still be crap in the exhaust that will make it run a little lumpy but will clear.

5k miles later it starts to surge when you get up to 2k revs and theres a funny whirrling noise and the same time.

If you floor it the problem goes away, but driving around in traffic it drives me mad!

Any one had a simulare fault or ideas whats causing it please?