Emacs with evil is excellent. I don't use a lot of vim plugins but it has all the basics, change surround with cs, commenting with gc, going to definition and f

Emacs with evil is excellent. I don't use a lot of vim plugins but it has all the basics, change surround with cs, commenting with gc, going to definition and finding references with gd and gD respectively, etc. Unless you have some custom vim plugins you should be fine.