I think my way of working is not too dissimilar from yours. I definitely use plenty of `rebase -i` in my workflow.