The group I ride with is ordering kits... and if I want to get one, I need to decide, right now. I don't absolutely have to get the kit, and I could just order the jersey.... but it might be nice to have.

Problem- what size shorts?
The brand is Sugoi (pro fit).
The size chart says:
S- waist 27, hips 36
M- waist 29, hips 39

My waist is 28 on a good day, and my hips are 36 (size 6 petite in regular clothes). My other shorts (Shebeest, Giordana, Performance) are M, but at the Performance shorts feel too big now and I hardly ever wear them. (I've lost a lot of weight over the last year, but have been pretty much level since May. )

So, it's kind of late to be asking this, but ....would you go for the bigger waist or the better fit on the hips?