Interesting! I think removing C3PO at the end is a great idea in this edit too. Whereas before he was central in the end (his head gets chopped off and put on a droid, and then they get back together again), in this film he is a coward and never leaves the ship (which is pretty much in character with the OT).
Therefore R2 should be the only one at the wedding.....