Ideally Yub Nub would be in place as simply source music - it's a little silly but it makes more sense for the Ewoks to play that than the Victory Celebration. We would see the Endor party with Yub Nub then we would transition into the force theme, see the galactic celebrations, then Luke burning Vader would be the final shot.

A more radical version would have the funeral after the Ewok celebration but before the other celebrations, then when we go to Endor and see Luke fly away into space as the force theme swells into the end credits.