I’d say it would fit better using the choirless version:
https://www.youtube.com/watch?v=zMnFpcf0Te4Doesn’t work for tone of fight neither would a full duel of the fates, I’d like to see another small allusion to Battle of the heroes, same way of what was done with DOTF from Solo.
The disc / suite version of Battle of the Heroes features a subtler beginning and ending section that don’t appear in Episode III. Maybe those parts could feature somewhere.