You are doing the same mistake, I've been doing. Seems that you are not really edging progressively looking at the first 3 pics. On the first pic you are fully attacking the wake (lots of spray), but instead of holding that edge you are getting off too early. One way that helped me fix that was taking a shorter approach. This way you automatically edge harder towards the wake because you don't have as much time to gather speed. I am sure you'll stick it soon! Haven't landed one myself yet, but I am getting closer.
The other thing you might want to try, is a tantrum. With your style of edging, you might actually find it easier.