I know what you mean about SURGE after 3000rpm!
I have oettinger remap 305/410Nm on paper. After 3000rpm, especially in 5th, 6th gears (because they are not as frantic as the other four) it feels like airplane accelerating along runway.

Now have problems with my car, does not feel 305hp anymore after the accident, repair, and remap. TOmorrow go to Oettinger again!