I have a Trek 1.5 and I hate how Trek/Bontrager just throws on "Bontrager Approved" parts. It makes it really hard to figure out what you actually have. (I guess you could always rip the bike apart and weigh the parts, but that doesn't sound like a fun idea nor does it tell you anything beyond the weight).
I was looking into upgrading the wheels, but then figured I would ride the "Approved" ones into the ground and then get something that I actually know about. Unless you are racing, I say just stick with what you have.