I wear long Under Armour brand shorts beneath cotton shorts with pockets. My commute is about the same distance as yours. The Under Armour shorts last a long time and effectively prevent chafing. I've never owned true cycling shorts.