Use vim-operator-insert
Use vim-operator-surround instead of vim-surround