IDK your shop, the Trek Dealer here would take your bike in and trade towards the 520.

NB 2_520s next year .. either rim or disc brake fittings on their frames ..

BTW when setting up a new bike ask the shop to change tires the bump up in price won't be much.

& swapping out the granny gears to a smaller one than factory fitted is also do able.