For commuting and light touring, I'd stick with the trek. One option is to buy a bike on craigslist for the parts and then sell the frame. I have the same frame as you have, built with mostly shimano 600 7-speed parts from another bike, and I can't imagine wanting anything fancier. It's a great frame for your purpose, IMO.