It took all summer, but I just finally found the perfect shorts from Club Monaco called “Mariana Jacquard City Shorts”
http://withlovegabrielle.com/twenties-are-for-mistakes-and-thirties-are-to-pay-for-them