Also, re: the ending. I don’t really see any merit in swapping the order of scenes, especially since up to this point every film has had a final scene without any (English) dialogue.
Every film has also had an ending involving the main characters 😉
Leia only has 15 seconds of screen time in Rogue One, she’s no main character.