I heard Codex CLI is doing good things now, might give that a go (I have not yet).