Update: Removed the scene with the clunky trashcan-looking robot aboard the sandcrawler. It it very obvious (way more more than C3PO) that there is a person inside. All in all it is bit too childish plus the whole droid sequence is too long in my opinion.
Editing: Just reversed a 13 frames from R2D2 leaning forward and added it right there so it starts leaning backward to match his actions after the cut scene. Also a few short (all together lest than a sec) cuts to accommodate the audio cut.
Audio: a straight cut at the points of best transition. Added a repetition of some robots noise to shorten the needed video cut.