So over the last two years I built Retcon. In the app, you can manipulate history directly (e.g. drag a commit to a different spot) at all times; even when there’s a conflict waiting for resolution, you can always keep making changes. You're not asked to first make a rebase TODO and then commit to it. So you no longer need to think too much ahead: you just make the changes you have in mind, see what that results in, and iterate on the spot. I think it really lowers the mental load of doing a rebase; most of the time you don't really think about it, you just do it.

You also can undo almost anything with ⌘Z. Like a commit deletion, sure, but also a conflict resolution: so you never have to start the rebase over if you make a mistake, you just go one step back. Once again, that both saves you a lot of time, and mental load. Undo even works for remote pushes, which is handy. (and is safe, using a custom “force push with lease” variant)

I hope you like it! The app has a two-week free trial, and is paid after that (currently 25% off for launch). I’m really curious to hear if Retcon does feel faster/freeing to you, as intended.