Levi 511's, loose on the waist, too tight on the thighs... what can I do?

Hi all, lately I've been taking steps to improve the fit of my clothes and move away from baggy/regular clothes that I used to wear and since getting heavily in to fitness my body shape has completely transformed and rendered all my current clothes "unfittable". I'm looking for a few pairs of jeans that are comfortable, and flexible, yet are slim fitting and look sharp, so I went ahead and ordered a pair of levi 511's in 30x32 and while the waist is loose, the thighs are really really tight and I can barely life my leg or sit down. Will they "wear-in" over time and get looser or is my tiny waist and muscular thighs going to be a big problem in getting the right fit? Are there any brands that make jeans for athletic guys, maybe?