I'll expand.
How about keeping him until someone actually beats him out for a position? He's a 26 year old 3 War player that is very popular in the clubhouse.
Imo, he's a super-sub when this team is winning divisions.
Another opinion: Avi stays long term. This cat has figured it out and is now a foundation player.