It looks like a very good scene order. I’m in favor of keeping the balcony scene, so I would be fine with any little adjustment to leave it somewhere. And that way you can keep most of the theatrical transitions.
(I hope with another break you’ll even find a way to keep the apartment scene “Not the Jedi I should be” 😄)