Apparently what you do makes sense for you, but I hope you realize that using interactive rebase you can turn your half-broken commits into nice and clean commits!

I try to do this as I go, but there is always a "history review and fix if necessary" stage after I've got the code I wanted and before merging.

Apart from having granular, reviewable, bisectable history, there were many a time when by having this extra look at the code I found bugs or design flaws.

Whether such effort is worth it for you, and whether you have time\energy\discipline\skills for it is a different question.