Vim has a better text editing experience, but Emacs is superior in every other way (customization, packages, file search, etc). So I suppose the answer is Emacs with evil-mode.
Team vim, team emacs, or team “my editor doesn’t start wars”? One line, no essays. Go!