IF it still managing to consume air per cycle well (ie with a decent VE) figure at high rpm (which will be the case if that fuel map is holding a steady AFR up to 6K) then you can certainly try more advance, but 40 is already a lot of ignition so the gains are going to be minimal probably.

If that happens, higher CR might be the way to go!