Please note that i know nothing about this stuff, just trying to learn the tuning side (I know the transmsision side of things) but I noticed that your WOT shifts seem to be perfectly in line with the "Select Shift" table under WOT Shift Map. Could it be as easy as raising the 2-3 on that table to get it to shift when you want it too?
I thought I had changed my OSS values to around 7400 rpm but it short shifted at around 7k. I used a conversion table to watch the OSS translate to rpm to get my desired points.
SS.png
2-3.png