I think you're right about changing your focus.
On the screenshot, you're already fully extended, but you haven't finished the bottom turn, so you've got got nothing to do when you're going up the wave.
Hold the bottom turn longer, then extend and lift your elbows so you can point at the lip.
Replied on Last one from the wave pool. Had a l...
28 Oct 22:46
Scott Wagenblast IIRC Clay and Ant did a Coach's Eye breakdown of John John Florence's surfing.
This photo shows how he's compressing on the bottom turn and using his coffee cup hand like a surfboard, skimming the surface of the wave.
I'd suggest this would be a good thing to work on.