You can try evil helix [1], so your muscle memory won't be affected.

[1] https://github.com/usagi-flow/evil-helix