It's a dilemma for sure and in my time I've done all three.

Let me ask you how you would make the Trek more distance worthy? New handlebars? New saddle?

And if you were to build up from a frame what frame are you thinking?