Can you still get a Trek 520. I would prefer a touring or cross bike too. Seems more versatile. You can put wider tires on as well as fenders. Plus the ride is more comfort oriented.

The Trek 1,1 looks interesting. You should check see if it will accept fenders if you plan on wet weather commuting.