Not ideal but does exactly what is wanted:

1. git commit -p small change (along with already staged changes)
2. git stash
3. git reset HEAD^
4. git commit -p small change
5. git add -u
6. git stash pop

We end up where we started, with the same material staged and unstaged, except the small change is committed.