What did you end up with? The Small or the Medium? I'm thinking about the same pair of shorts and have the same hip measurement you do. Which size was the 'winner'?.....And what do you think of them so far??.........Thanks!