Well, after having talked directly to Trek, they say to just keep on waiting. Evidently there is a difference in the inside diameter between Bontrager and Shimano and it's almost like an "adaptor" (for lack of a better word) that I need. Talked to a mechanic at Richardson BikeMart up in Dallas, though, and he said they had switched a couple of them out using FSA parts. Who knows....