Possible Plot Hole Question

I noticed that Jay Moriarty was training hard to surf Mavericks and he was part of the lineup at the end(obviously). Sonny, the baseball-bat-carrying antagonist, appeared at the lineup at Mavericks also. I was originally questioning how he was able to make it out there to surf when Jay was training for months with Frosty. This bothered me at first.

I mention this because I would love to get feedback from anyone who disagrees with this being a plot hole.

My personal guess is that they used Sonny as a plot device for these scenes he was in to show the antagonistic dynamic with Jay. I think they had Sonny at Mavericks at the end when he lost his antagonistic attitude for dramatic reasons. This was the best dramatic place for him to have a heel-face turn.