The C-3PO dilemma has been solved, and I'm confident everyone will be pleased with the final result.
As for the scene you mentioned, a reaction smile from Shmi has been added to make for a smooth transition. Many scenes have been resequenced, and the flow on Tatooine, while radically different from the original, is wonderful.