The 3PO stuff is hilarious. Nicely done.
You’re definitely taking it very seriously to leave the original structure in place! I think that’s great. I know if I was rewriting some of these scenes I would just slap what I liked better in without considering the structure.