FWIW I think you're making a wise decision. However, I hope that your LBS will share your dissatisfaction with trek and steer their customers towards other lines.
I've been following this thread out of curiosity and I agree, I'd love to have people know about this, and I'd like Trek to know that people know.
Calfee will do a fabulous job, though.
My photoblog http://dragons-fly-peacefully.blogspot.com/
Bacchetta Giro (recumbent commuter)
Bacchetta Corsa (recumbent "fast" bike)
Greespeed X3 (recumbent "just for fun" trike)
Strada Velomobile
I will never buy another bike!