Vote #3 for the Performance Brand Shorts but shorts are like seats, what works for one person may not work for another - same with commando. I don't wear anything under my shorts but then - my bra and undies are the first thing to come off when I get home for the evening so I'm probably not the person to ask!
You might try the same distance with undies and without and see which you feel more comfortable with.
Life should NOT be a journey to the grave with the intention of arriving safely in an attractive and well preserved body, but rather to skid in sideways, champagne in one hand, strawberries in the other, body thoroughly used up, totally worn out and screaming: "Yeah Baby! What a Ride!"