GLC-

Speaking as someone who has large thighs/small belly, I'd like to recommend a bibshort. Then you don't have to worry about the waist at all.

As far as the other problem... I can only dream of a day when medium bike shorts would be too large to fit snugly around my legs.