Learning from that experience.... this year, I took 2 pairs of Icebreaker merino boxer shorts to Mongolia - what a revelation! Highly recommended. They wick sweat incredibly well (tested many times ski-touring), pack smaller than cotton versions, dry fast when washed, and don't stink when not plus seamless - what's not to like (thumbs)
Downsides - cost. Although, if you look at the price while in your current state of pain, it won't seem so bad
