I finally orderd my new Jamis Aurora!
I upgraded the rear derailleur to XT, the shifters to Ultegra and I'm swapping out the adjustable stem, and going with new wheels with XT hubs an Mavic Open Pro rims. Also getting a Shimano Flight Deck computer (some hate 'em, I like 'em).
Supposed to take delivery in about 10 days. I can not wait. My wife has been accusing me of being obsessed.
I'll post a pic or 2 as soon as I can. Thanks to everyone who offered advice and talked me out of the Elite. I think this was the better way to go. More bike for less money, too.