Perhaps the original ending music would be more palatable if any allusion to it being an Ewok tune was removed.
During the celebration the Ewoks could play a very basic tribal tune with no vocal (but the same rhythmic structure) and then the orchestra and the choir could fade in.
One of the problems with the "Yub Nub" song (especially the film version which is very different from the album version) is the attempt at poetic beauty backfires into comedy.
What is attempted was to have the Ewoks sing their celebration song and the orchestra and choir (presumably representing the Galaxy and the audience take over) but it comes across as the Ewoks suddenly developing amazing choral skills (the Ewoks become Welsh).
If the Ewok singing was removed that effect might come across better but it would need someone skilled in music editing to try it.