I don't have a diesel, but have an E60 535i that was surging as well. The intake ports were all gunked up from the direct injection backflow into the ports. Seems to be common on the DI/turbo motors. Have you checked the swirl ports? I think they get caked up and cause drivability issues.