Give git-autofixup a try, never had any incorrect fixup targets with it's hunk-based algorithm.