I'm not at all tall (5'3") with a longish torso and short legs. I have a Trek 7.5 WSD that I bought before I knew anything about fitting bikes. Recently I took it to a fitter who said that the bike was the right size ("not at all too big for you" was how he put it) but that he would have probably had me try one size up if he were selling it to me today. We ended up putting a longer stem on it, which has helped considerably; apparently my longer torso was scrunched a bit with the stock stem. FWIW.

I'm glad the other shop out of town is helping you out more! Good luck!