Originally Posted by TheOtherDave™

In order to make power above 8500rpm, you will need a high-lift, long-duration cam with a substantial amount of overlap. You would also benefit from far higher static compression.

Both the increase in CR and the valve overlap are detrimental to your plans for a turbocharged build. It sounds to me like you're trying to change your mind 2/3rds of the way through your build.

The obvious answer is to finish the turbo build.