I am not sure why you insist on not stashing the rest of your working directory ? This is a nice and non-permanent solution.

There's a difference between `stash -p` and `add -p + stash`, though. If you want to split your changes into more than two commits, you have to use add/commit/add/commit because stash will just make a commit with "what's left" (it's subtractive operation).