You can skip the explicit staging using

  git commit --patch

then interactively select the specific changes by diff hunk.

It combines with --amend.