Yeah, maybe tight shorts (like these?
Surge Shorts from MEC) with another pair of loose shorts on top if you feel uncomfortable showing your curves?