> I had to switch away from fish as well because of its lack of vi bindings.

No you didn't. I use vim and fish just fine. Just put this in your .vimrc:

  set shell=/bin/bash