An update:
As suggested here I have decided to fit up the Trek. I've actually turned the bike into a commuting and touring bike and kept the road bike pretty stock. I added a Filzer PR-4 rack, MEC Aquanot Panniers , Planet Bike Fenders and a trekking bar. The trekking bar still needs a bit of setup (want to add bar tape to it). The trekking bars seem interesting, from my time on the trainer it seems like many hand positions are available, I may be able to lay my forearms directly across them.

For tires, I forgot to mention that I had replaced the stock 700 x 35s with 700 x 28 Schwalbe Marathon. I assume these will be ok as the roads are all paved over there. I've also dropped between 5 and 10 lbs so less weight for the bike.