[shhsshs]

I’ve kind of learned how to juggle the two disconnected undo buffers in my mind. If I want to just go “back in time”, repeating even my previous undo/redos, I use Ctrl-Z. To undo a quick mistake I use Vim’s undo. I guess I treat them like short-term and long-term “undo” actions.

Sounds kind of weird now that I’ve put it in writing. It works for me but YMMV.