One more year of team control. No one blocking him at 3B or in the corner OF
If he's healthy, give him games. See what happens. If no progress, no arbitration.
That sounds like a good plan.
The optimist in me wants to believe that he tore it/aggrevated it in September last year and that last August was him figuring it out