I backtracked all the way to Bash. Because I seem to write some amounts of bash scripts, it seems living inside bash is helpful. And it's really not much I feel like I am missing in my use from zsh (or fish). Bash even supports CTRL+R for history with search nowadays.
Yes, I've had to get clear where they differ, but the Fish experience is that much better that it seems worth it.
I've considered replacing more my bash scripts with Fish scripts, but it seems Fish has a slower start start-up time for scripting (not that it matters most of the time) and is more designed for interactive use.