FYI, one line change each to your bashrc and inputrc will get you vi keybindings instead of emacs
My solution to that issue is "just" alternate bindings which obsolete both the standard and vi navigation keys. At the home row, I have the arrow keys on my right hand and a "nav cluster" of my own devising (page up/down, tab left/right, workspace left/right) on the left.
Definitely not for everyone, but a possible way to have your cake and eat it too.
set -o vi
inputrc: set editing-mode vi
Now bash and anything using readline will use vi key bindings. This Just Works for most of the common cli tools, e.g. the python shell and psql, but there are exceptions. In the past, the mysql client hasn't respected these settings, and there's also a node library called vorpal that is reinventing readline, poorly and for no obvious reason.