Adopting https://github.com/marlonrichert/zsh-snap was probably the best decision I've made around zsh in the last five years.