If it's for TAR31 and there's a guarantee that CBS will allow TAR to go out on their terms whenever it's time, that is, CBS will still always give TAR one more season if they ever decide it's time to end the show...
then TAR31 should be a regular season with regular people, no specific gimmick. Just cast good teams. Very simple.