Okay, yeah - gotta address the Dooku flip.

I fixed it by removing him from the balcony altogether, and just having him strolling down the floor.
But... when I rearranged the scene for a more dramatic buildup - with the dialogue and all - it felt really awkward for him not to have his epic walking in. And in order to have that, he needs to be on the balcony, and it's weird to have him teleport.

However - I could go with Bob Garcia's approach, and have Dooku enter through a door on the ground level.