I go with tri shorts. Much smaller pad (designed to be able to run and swim in them as well as ride a bike), so if I have to walk around for a while before I can change they don't cause a problem, still some slight pad, wick moisture pretty well, keep things cradled and separated so no chafing, and they dry faster in my locker than bibs/shorts with pads. I only have 3-4 pairs (1 pearl izumi the rest louis garneau all bought from nashbar on sale), but I wish I had more because they're the perfect commuter option for me. I use them as liners as I'm too self conscious to wear lycra to work.
__________________
Bikes: 1996 Eddy Merckx Titanium EX, 1989/90 Colnago Super(issimo?) Piu(?), 1990 Concorde Aquila(hit by car while riding), others in build queue "when I get the time"