Smoak is a sunk cost. If he's a stumbling block for a genuine upgrade then I'm really disappointed. They're letting the Smoak problem just compound itself to hurt 2017.
They extended him to avoid being frozen out of 1B bidding wars, but there are no bidding wars and upgrades are/were everywhere (Bautista, Carter, EE, Moss, Napoli)