I sadly don't think we'll ever beat seeing him in a speedo unless we somehow get to see him naked.
That was peak. Hopefully they just do another beach episode and think "oh let's keep this joke running" and give him a speedo again. Or Connor.