If you haven't done so already I'd also recommend looking at evil-collection (https://github.com/emacs-evil/evil-collection). This enables Evil keybindings throughout Emacs which can certainly help.