I actually have a paid invoice, with a 15% deposit, so I think the price will not change. And I'm working both the Trek rep and LBS for some add-ons (rack, pump, bar ends, ???) for the "pain and suffering" of waiting.
Trek says there will be no different between '06 and '07 models so the price should not be much of an issue.
As for looking elsewhere, I'm a believer in supporting my local LBS. They've had my back on many occasions with repairs, parts, advice, and I want the Trek support, just in case.
Appreciate all the comments!