Skeptic
Adventurer
Your Trek can take a new fork with disc mounts, between that and a disc-capable wheel, you aren't out as much as a good new bike.
Either suspension or solid fork, depending on your preference...
Having settled on a new bike now, I decided to keep the Trek as a campground bike for when we take the travel trailer out, and to put on the trainer as an exercise bike. I hate to give it up, but I'm not sure I want to invest anything more for a new fork.
Thanks