Compression shorts for the junk in the trunk

All the relevant threads I found were old, hoping for new models maybe?

At my first 50k my kit was serving me well up until about mile 27, when I started getting pain in my thighs and butt from, uh, the jiggle. I was wearing Rabbit Speed Leggy 7", and while I love them, past the marathon mark I guess I just need more support. Problem is, being squeezed too tight in the waist makes me want to barf.

So: looking for recommendations for compression shorts that will securely hold the junk in my trunk but spare me the clothing-induced GI distress. Anyone?