I'm also in the emacs camp, but no-one seems to have addressed your undo-tree requirement in the comments I've seen! There seems to be an undo-tree vim package

I'm also in the emacs camp, but no-one seems to have addressed your undo-tree requirement in the comments I've seen! There seems to be an undo-tree vim package that looks like what you want here[0] so you could check that out? [0] https://github.com/mbbill/undotree https://github.com/mbbill/undotree