Wing...some broodies move easily and some have hissy fits if you even try. So probably leave them in their chosen boxes and mark the eggs like you said. They will be rather easily moved once they hatch.
That is my plan, will need to take the extra effort to keep extra straw in those boxes, hopefully will keep eggs from getting broken from others climbing in with them...
If it does not work I will just co spider it a lesson learned, or what not to do next time.