Just curious, how can you use both? Isn't muscle memory an obstacle when switching between them?
The only thing I've had to do was to map <C-x><C-s> in vim to ":w".
I myself started with evil after a long time with vi(m) and then made the switch to a more "pure" (for the lack of a better word) Emacs experience.
I am still very proficient with vim, even though Emacs has been my daily driver for 4 years.