Just as important as getting the right jeans, IMO, is getting the right boots.
As you're concerned about your thighs and calves, I would say, always wear dark coloured skinnies with knee length, slouchy boots (if you feel you need more height - with with a chunky, slightly tapered heel); to balance your thighs out and camouflage your calves (in the way that the flare of your bootlegs did).
Also, if you ever intend to wear your skinnies with shoes (rather than boots), buy your skinnies floor length, so that you have ankle scrunch, to achieve a similar end.
Leg warmers, or thick socks, may also help you achieve this balance, if you intend to wear ankle boots.
If you like ugg boots, I would highly recommend Love From Australia brand. Because of the thickness of the sheepskin, longer length, darker coloured (black or brown) ugg boots should balance your thighs well and no one will know how wide, or narrow, your calves are! Also, even if they are tight at first, around your calves, the wool will flatten and they will give.
Try to buy a design that you can undo and tighten and loosen, rather than a pull-on style.
Suede boots also have more give and slouch than most leather boots and because they are matt, rather than shiny, like most leather, they won't draw attention to your calves.
If you are interested in high end designer boots, NAP are great, as they give the calf widths for the various foot sizes.
BTW, I hope you don't have small feet for your height/leg length. That's my main problem, and I generally find that what fits my foot, is too short and therefore, narrow in the calf.
Finally, wear looser tops to balance your lower half.
Hope this helps!