Instead of commit, i just stage them while I do clean ups. So that if I'm successful I stage the cleanup, else I remove the unstaged changes.

Through if you do local commit and amend it later it's not that different.