It seems pretty clear what your next map change should be.

If its not obvious to you, you need to lean off the top right hand of the map, probably as much as 20% at the extreme top right but you want to make it a gradual decrease from say 5000RPM and 3/4 throttle.

A better option though would be to go closed loop. It probably would have run properly on the dyno