On the subject of too-tight swim briefs, I watched a video from no less than Tom Daley on what he carries in his gym/diving bag. The url is
https://youtu.be/XUjPXhrt-vc
The discussion on the sizing of swim briefs occurs early in the video...he downsizes to a 28 inch waist...