I’d like to suggest completely removing the Leia and Wicket scene. Add a bit of tension wondering where she is, and the Ewoks seem more of a threat if you haven’t seen one nibbling snacks from a stranger and frightened of helmets.
If it makes you feel better the fanedit I’m working on of the film does this. The thread is around here somewhere I don’t post in it much because I’m very on again off again when it comes to working on it, one of these days I’m just going to randomly surprise everybody with it being done.