You might already be aware, but jj fixes exactly those complaints you have with git