I don't see a problem with the upgrade path. I recently upgraded the brakes on my LHT from the stock Tektro Oryx to Paul Touring Cantis. The difference is very noticeable.

For bike +1, may I suggest something like a Christiania. Cheaper than a race-grade bike, and more practical for running to the home supply store for potting soil, etc.