Well the problem you have now is that there are too many features, they conflict together, files get mixed up with the various reviewing tools, options, now worktrees applying stuff back. I'd actually remove features, make only a core set of things that work reliably together.