Have you had a chance to try jj? (It's git compatible)