But I do agree with you. At least some parts of the Yoda duel should stay as the climax of the fight, otherwise it feels like something’s missing. Spence’s trims to the Anakin vs Dooku fight were very well done, but all they did was highlight how poorly choreographed the fight was in general. I wouldn’t want the climax of the movie to end on that note.
I’ll consider it/ play with it. I personally feel like it’s just one thing too many. You’ve got to remember that there’s 20 minutes of non-stop action prior to this sequence, and having Yoda show up doesn’t serve much of a narrative purpose.