I have a lot of luck with Eddie Bauer jeans and pants. I am a *curvy* gal with a smallish waist to hip ratio and these jeans have a very flattering fit. (FYI, my thighs are about 23 1/2 ")
Lands End can customize pants for you. I like Lands End stuff because it's very well crafted and they put a lot of thought into the designs.
Also, Lee fits me well.
Since you are in between sizes, look for pants with the hidden tab in the waistband that lets you adjust it to fit.