I love fish-shell, but after years of using it I switched to Oh My ZSH!. The bash compatibility makes it a whole lot easier to use when you're the type of person who has to look up "how to do X on the command line" on the internet more often than you'd like to admit (that would be me).
have you tried https://github.com/oh-my-fish/oh-my-fish ? has been serving me well for years
It's mainly the bash compatibility - does Oh My Fish fix that problem?
The bass plugin[1] works well.