I would also say you could put Yandy Diaz on the short list as well since no one doubts he will be on the team by next season. Zimmer, Allen and Meija will also be in spring training with the big boys, but they are a few seasons away.
Though Brantley should be 2017 by your list since he has a team option year for 2018. Kluber cannot become a free agent before 2019 while Chisenhall is arbitration eligible in 17 and 18 and not a free agent until 19. Guys like Gomes and Kipnis have team option years in their contracts so most of the guys we have are on team friendly contracts. We need to extend guys like Salazar, Lindor and Bauer here soon, so you may see that next offseason with Salazar, Bauer.