If you're really wanting to exchange the Sirrus for the Trek, make sure that the LBS has the exact model that you're interested in. Don't fall for the assumption that the ride will be basically the same based upon the frame, or you will have the same problem with the Trek that you find yourself having now with the Specialized.

Of course, it would be much easier if you just started to believe in the n+1 theory of bike ownership.