@botteaap yeah that's a hard problem to solve, I personally use git-absorb for it but in my case the changes are across multiple commits rather than unstaged.

https://github.com/tummychow/git-absorb/