It sounds like you have an excellent bike. Certainly something that should be able to make the trip from Seattle to Portland.

You could tinker around with the components somewhat if you wished. 11s? But it gets expensive for minimal gain.

The Specialized Roubaix line is also supposed to be very nice, and worth exploring.

I concur, while I generally encourage exploring the used market (and taking what you can find), there would certainly be benefits of going to various shops. Test riding the new bikes, and getting a bike custom configured to your size and fit.

Trek also has their "Project One" which allows a fairly high degree of customization. It is worth exploring.