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.