What annoys me is that Attack of the Clones literally has a few seconds of extra dialogue that wasn’t in the theatrical release that Lucas just felt he had to put in even though there’s a perfectly nice Deleted Scenes section on the DVD (and later Blu-Ray). This isn’t much, but it’s just enough to make it a different film than the one shown in theaters. Hopefully this would be a significantly easier fix than going through TPM and taking out the extra shots from the pod race and reinserting the original puppet Yoda along with the other aggravating difficulties.
For reasons that have been described in a few of the other threads on the same topic, AoTC is actually the more difficult one. There are a few shots which do not exist as in the theatrical version, except on film (though the digital theatrical release did have the updated robotic hand, so that could be considered fair game). To get it perfect, the scene you describe with the additional dialogue also needs to be modified. To insert that dialogue, they shortened the shots before and after.