I talked with a lovely woman at TE, whose measurements are the same as mine. She has the small, so small it is. Off to place an order.

Anyway to get over feeling self conscious about wearing biking shorts?