I can see Andy making a play for the Vuelta or Giro and putting his eggs in one of those baskets. He's struggled with injuries since 2011, but for 3 years before that he was as good as anyone in the mountains at the Tour. If he gets a clean run at a season, he can maybe have a real go at winning another GT. He truns 30 next year, so has a good couple of years left.
You have to wonder who Trek's GC rider will be then. They've one of the biggest budgets in cycling, and the only time they've won a GT, (Horner) they promptly let that rider go at the end of the season.