PI swap will give you a nice compression bump and you can use your new cams. Unfortunately the PI heads would compound your problems of needing the higher RPM stall, as well as limit your boost potential due to the higher static CR, but it is something to consider.
The Vortech could also work...