Give Ace Wheelworks in Somerville (near Davis Sq and Porter Sq) a shot too. As the smaller "frontier" shop, you get awesome LBS treatment with backing of the larger Belmont store. In addition to the usual Treks, LeMonds, Cannondale and Specialized brands, they are also keen on customs like IF, Seven, and their own frame builder, Peter Mooney. Oh, and they carry some of the more "exotic" brands like Colnago, Time, etc if prefer those.
And as much as I like the Wheelworks store, I dislike ATA Bikes. Man, those guys are something else...