I keep hoping a better Vim will come alone. KDE's Kate gets closer as its Vi bindings improve, but it's still a big enough uncanny valley that I can't switch over (and I'm a KDE dev!).