You know what? Now that I think about it, maybe it’s better to cut the first kiss altogether, because the first kiss on the lake creates a lot of problems. Maybe it’s better if their first kiss is in the Geonosis arena. So, the order of the scenes would be this:

Obi-Wan arrives on Kamino, speaks to prime minister
Padmé visits her family
Obi-Wan tours the facility and sees the clone troopers
Meadow picnic
Obi-Wan questions Jango Fett
Sunset dinner, leads right into fireplace scene (with my modified version of the dialogue)
Obi-Wan reports to the Council in the rain

Maybe it’s better to cut off the first kiss altogether. The fact that their first kiss is on Geonosis makes everything more epic and realistic, so just cut the first kiss, and that’s it. It works better.