How about just not moving it, it's fine where it is.
Anyone who who is auto'd for one pick is set to full auto until they decide to change it.
I am completely against an 'extra draft' - it throws out the talent balance for future years and there is no 'fair' way to run it.
We also trade draft picks into the future so they quality of the draft can't be manually tampered with.
Just remember, it's not the draft that's broken, it's GMs taking too much time. Come up with solutions to fix the real problem, the real problem isn't when the draft is held.