Assuming the lux tax structure stays about the same, I think it might depend on if we win it all, or not.
If we win, we may try to stay under another year. If we lose, I think we go over. We may go over, no matter what.
Even if we go over, spending $22-26M a year on Baez will mean the rest of the budget goes all to pitching. That might already take away too much from pitching, unless we are going over by a significant amount.
(I'm not very good at predicting FA contracts or arb raises.)