We had one a while ago that had same symptoms as an EGR being slightly stuck open (Laggy upto 2000rpm). Anyway after a lot of testing we found the intake camshaft to be out!

Turned out fault had been there since customer owned the car, so must have had some engine work previous and not been put back together very well.