I have a suggestion to make. I think Anakin’s line to Padmé, “If Master Obi-Wan caught me doing this, he’d be very grumpy.” should be removed. It’s quite a childish thing for Anakin to say.
I think that’s actually one of the few lines that’s goofy in an intentional, almost charming way. Coupled with cuts that make Obi-wan less actually, persistently grumpy, it’s just a cute, funny little line.