Re timdiggerm.
Yes that edit is a little harsher than I would've liked. But I've also cut every reference to the foolish Amidala/Padme double subplot from the whole film. So seeing the Keira Knightley double in full Queen makeup would be confusing at that stage.
This means the Queen seems less aloof and Padme seems stronger because you no longer see them as two seperate characters. Plus cutting the reveal makes Obi-Wan, Gui-Gon, Anakin and well just about everybody seem less like idiots.
Any other questions I'd be glad to answer.
Ryan