Another update.
I got BPR7ES spark plugs installed gapped at 0.22 and you can feel a difference.
This is now fuel map tuned and timing advanced with no knocks at all. Boost is still 22 and tapering down to 19 towards the top end. I am waiting for 3 port solenoid so I can start tuning the boost with hopefully even more power.