I think they are reasonable choices. If it ends up anything like what they added in DCA, it will actually be a plus IMHO. Changing Main Street Bakery is fair given the overlap of items with a Starbucks; much better than the rumor of the Plaza Restaurant going.
Reading the official blog post, I didn't get the impression that any of the bakery products were staying, they are all being replaced with $tarbuck$ products. I am now for sure doing breakfast there in December for one last hurrah.