To some of us, bikes are becoming less of an investment and more of an addiction. Be careful when the N+1 disease hits!
If you had the funds for it, I would suggest the FX3, that is great bike that you would not really be wanting to upgrade much anytime soon.
IF you get a chance, look at the Giant Escapes, Cannondale Quick, Scott Sub Speed, etc, etc, etc......then make sure your aspirin or Tylenol is ready, cause you may end up getting a headache looking at it all.
BUT, if you are comfortable with the LBS, they are treating you well, and offer you some services, then that is as good as getting a bike that fits and you would enjoy.
BUT, YOU need to choose which bike fits and feels better to you. All of us are just going to give our personal opinions about things we like and can afford.