As a TREK bike store owner from that era, I can say you might be better served putting your post in the mountain bike section since you upgrades are more in line with your mountain bike, not so much bike touring. I can tell you that if you want stronger brakes/ larger 180 mm rotors, you will need (10mm) longer anchor bolts and four 10 mm spacers. Next time take an extra derailleur hanger.