There is really no reason for him to worry about coming back before next year. Wouldn't do well at the WTF anyway, never has even in his best years. The only possible thing is if Spain does make the Davis Cup finals, otherwise no reason to play.
Yup, he can have another cupcake final due to his mates' efforts. It will be typical and he will then be lauded as a martyr