(speaking of discontinuity issues, anyone that ends up dispensing with the ‘Chewie/Nurse’ scene also gets rid of the fact that she is suddenly holding the gadget in her other hand)
You hurt the Chewie/Doctor scene, you’ve gotta deal with me! 😛
Great bit of restructuring, and I don’t see how Snap poses a problem. And I would not allow Leia’s hairstyle to prevent using the scene.