Maybe instead of showing the really short recap (how could he have won them over with such a fast story session is beyond me), we jump to the end and the Ewoks accepting the Rebels into the tribe.

He could then talk about their plan to destroy the shield and Artoo could demonstrate that with holograms.

Though I still think the Ewoks should already be planning to attack the Imperials as that is the only explanation for how quickly the traps are up.

Alternatively Threepio could start telling the story, Luke and Leia could have their moment and by then Threepio could have finished. The Ewoks are won over and Han goes outside to find Leia upset.

It would require a bit of editing around the edges to remove Leia and Luke when they aren't there but it could make the scene work better.