At 4K rpm, you are just getting into boost. There should be plenty more left with that combo. Injector slopes, breakpoints, Maf slopes, timing curves, it all starts making a big difference. So once the mechanicals are out of the way, I am sincerely hoping you are blown away... no pun...