i have a possible solution to the ewok question. i was trying to put it together on Final Cut but i am having issues.

when we first see scout troopers, what if they are ambushed by ewoks? the rebels could go down to assist them perhaps? this could introduce them as killers. footage for this can be stolen from the battle of endor.

after the encounter, they could just go to the village without being tied up, bonding over a common enemy. leia just follows wicket there. not sure what luke's journey would be.