I have my instance set up to enable/disable evil via a keybinding. That way, the edge cases can be handled smoothly. There is also a way to configure evil so that emacs keybindings work while in Insert mode, but not in Normal or Visual mode, if that matters at all.