I think we should remove Jakku and have Naboo and Corellia, that way we can have the all home worlds of the main characters in the Movie. Except Aladeraan 😦

Luke & Anakin - Tatooine (Homstead ending)

Han Solo - Corellia (Celebration addition) Solo Footage.

Padme - Naboo Theed City Shot (Celebration addition) Using Phantom Menace footage. https://imgur.com/RT7MX50

Would work perfectly.
Tatooine, Corellia, Naboo.

Scene would then obviously not have Jakku, but I definately think Bespin Cloud City should stay.