Just use opus 5.5 for any code that needs to actually be merged.
It’s just that Codex, the harness, is hot garbage. I’m going to invest some time in using Astra with OpenCode to see if I can live with that but going back to Anthropic is very low on my preference list.