I enjoy both endings. Yub Nub is a great ending to the trilogy as a whole. The Victory Celebration is a great whole saga piece, I prefer the 97’ cut. Victory but with Sabastian Shaw.
A version with the new song, no montage, and Sebastian Shaw would be an acceptable compromise for me.
Enjoy