Well, it's been a week later and a lot sure has changed on the Trek. I decided to go the fixed gear route..but no worries - nothing is shaved off, and I still have all the original components labeled in individual bags so that if I ever do need to bring this back it original spec, it shouldn't take long.
I upgraded the wheelset to Weinmann DP18's (flip flop hub), a new Shimano chainring (that Biopace thing wasn't working for me), cog, lockring, etc. Running 42/16 and I love how smooth the bike feels.