I'm starting to think along those lines. Just trying to work out which way means I have to buy the least amount of stuff.
Cassettes are usually the best thing to change, as they wear anyway. But in this case I'd go for the trekking triple, and upgrade your cassette when it needs it.