I'm glad your LBS seems to be taking responsibility and working to get you on the right bike.
I have had the chance to take the bike out on two rides and both times I am getting incredible amounts of pain top of my right thigh area and behind my thigh on same leg. I stretched after each ride. Can this be the adjustment to newer bike still or still not a perfect fit?? I don't want to pay a few hundred for a fitting this is silly

Last time I was in at the shop they said the bike looks good on me. I dont want to keep going back and forth and enduring pain. I just want to ride my bike!!! Say for example if I get them to take the bike back and go through another LBS I am interested in the Trek 7.2 FX WSD (actually this was my 2nd choice bike) are the components on par or better than what I have now?
Alight 2
http://www.giant-bicycles.com/en-us/...specifications
Trek
http://www.trekbikes.com/us/en/bikes...fx/7_2_fx_wsd/