If you’re open to a paradigm shift, I can’t recommend atuin highly enough. It’s truly the pinnacle of shell history tooling, but requires a ~1-2 day muscle-memory learning curve.

https://atuin.sh/