Hivemaker.
Queen Bee
Mons A I did the same and mine swarmed. At the time I blamed the "leave 2 queen cells and they will sort it out theory" because as soon as the first queen emerged off they went. In future I intend to remove one of the 2 cells 2 days before emergence. Like you because of space I could only go one way.
So at least this thread has taught me something as I will move a 2nd time in future.
If you carried out your AS all under one roof then you would not be needing to move box's from one side to another,and only need an extra brood box frames and crown board.