Well, spending a little time this evening experimenting on this yielded a good scene ordering that includes both the extended arrival on Naboo and the Naberrie family without demanding crap scene transitions. I believe it was the same scene ordering I tried quite a while back, but it seems like a fresh attempt make it work.
The order of scenes for this chunk of the movie will be as follows: Landing platform with Mace and Obi-Wan, extended arrival on Naboo, arrival on Kamino, Naberrie family, touring the cloning facility, picnic, Fett’s quarters, sunset dinner and nighttime kiss, and Obi-Wan reporting to Mace and Yoda.
Many of those scene transitions are original to the film itself, so I think it’s a net gain anyhow. The longer the v4 source materials are delayed, the better things can potentially get, but v4 will be the end of the road.