I’m leaning toward order B right now. Especially with adding the “soon I will have a new apprentice” scene right beforehand, the balcony scene feels out of place without the nightmare following it.
Since I’m putting out an alternate ending version, perhaps I could remove the title ‘Labyrinth of Evil’ altogether and adjust the scene order to go ahead and have the nightmare take place that first night as in ROTS.
The two core ideas behind LOE have been having Padmé go to live on Alderaan and to shift the nightmare to after the other factors for Anakin’s turn have been laid in. An alternate version that forsakes these isn’t LOE anymore, but might be worth doing and publishing for those who would want it. It would have my other sensibilities about the rest of the movie, just not driven by those two ideas.