I love the idea of Yoda not using a lightsaber until he kills the two clone troopers during Order 66.
But perhaps he could fight Dooku by only using the Force. In fact, this is exactly what I did in my edit, I eliminated the lightsaber duel, but I left the Force duel between Dooku and Yoda intact. Honestly, I’m very satisfied with the result, and if you want I can send you my edit in private, so you can copy that clip and use it in your edit.
I mean, that’s not exactly an original idea. Hal already did it to great effect in his own edit.
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.