Nice looking Trek, I can understand your angst about the paint getting pranged up. Definite kudos to Yellow Jersey, this is the second positive post about their service being high quality. All LBS should follow their lead, I am certainly glad that our LBS does many of the same things for us here. Glad things turned out for the best for the bike, and for you.
Bill