I’ve always been fond of Yub Nub/ Ewok Celebration. Perhaps a bit childish as the grand finale, but I think just chucking the entire thing out to be replaced was throwing the baby out with the bathwater. The melody is beautiful and I think could’ve easily transitioned into a more mature-sounding arrangement a bit earlier before the credits to get the best of both worlds (happy Ewok partying plus poignant hard-won victory).
While we’re on the subject, here’s one of my favorite renditions: https://youtu.be/FnkD9Wz3fTg?si=_URR7ixhb3igN7kR