Perhaps take a look at jj and give it a go. Maybe you’ll like it.

I know I did. The fact I can use it with git and it doesn’t interfere with any GitHub PR workflows means no-one needs to know I use it. I enjoy the jj model. Maybe you could too, and it’s not a crazy investment of time and energy. It’s an evening playing around with a code kata or something.

Then working with vcs becomes that little bit more enjoyable.