Compared to Duel of the Fates, Battle of the Heroes suits the fight better in terms of pacing and emotion, but I believe it’s too linked to Anakin and Obi-Wan’s fight. There’s a combined Battle of the Heroes and DOTF track made by Samuel Kim which I placed over the duel once out of curiosity. It would fit pretty well if it weren’t for the fact it doesn’t resemble John Williams very much.
But I really think DOTF should be in this movie in some way, mostly because I’m still bitter that Lucasfilm used the theme to promote this movie but wasn’t in the actual cut. But it also would be a nice nod to the scrapped Episode 9 script of the same name.