If I were to upgrade today, it would be a Vaya with thinner road tires. FWIW.

Good luck! Hope you get something great.