I really doubt they'll swap in Grok. Grok seems pretty dead. Probably more likely they'll reuse the hardware for composer.

If value is a concern, Codex. It's pretty hard to beat those subsidies. If you really want model freedom, Copilot is surprisingly decent value and as of right now let's you use your sub in other harnesses like OpenCode.