Yes, if you're still on your board after shifting your balance by 4 +/- Stoke tokens, you are still on the wave. You don't get a Barrel token though, as you jumped over the barrel instead of riding it.
Every time I get an alert there's a new question in the Tavarua form, it's already been competently answered! You're such a boss Adria!!