I can't seem to find a pic of the Trek 2500 through google, but that sounds very fimilar. Maybe I"ll catch up to the fellow again next week.
Good to hear your new parts are working out well for you on the bike. New derailleurs do make for a nice upgrade. Went from Shimano 400 / FE (early 80s) to mid 90's 105 on my roadie. Shifting is much smoother, quieter and more responsive.