Pearl izumi's liner/shorts (MTB type or not) are comfortable and also offer hip pockets of varying sizes.
IMO the best way to keep yourself (and your clothes) from being overly smelly is to ride at an easier pace. A couple months ago I started following the 'slow is the new fast' approach described here:
http://www.bikeradar.com/fitness/art...yclists-28838/ (get faster by taking it easy? Oh heck, why not!), and it's allowed me to gradually get myself up to what I feel is a comfortable pace w/o pushing my heart rate up. My main goal was to be recovered enough in between frisbee practice and harder bike rides by taking everything else easy, but the added benefit has been that I can get to work almost sweat-free. I know there's a lot of people here who have long rides and want to make a workout out of their commute, but with a relatively short commute this could be worth looking at.
If I ride slower and sweat less it shortens my transition time once I get to work. But I don't have access to the shower that you do either.
One thing I do at home that hasn't been mentioned is to spray my bike clothes with a mixture of water and vinegar after rinsing them out. It helps cut the smell without going down the laundryroom to do a load a wash.