My trick has always been to rely on tab auto-completion.
mv foo-<tab>
mv foo-bar-baz foo-<tab>
mv foo-bar-baz foo-bar-baz
Now I can edit the second part pretty quickly.Downside: you have to at least type `foo-` twice.
Upside: command line history still has the full command.