as I said, not fond of Yodas duels ;-)
just wanted to give an idea as to how "fix" the fights, if one wants to keep them ...
going "radical": I agree, it would be better to cut Yoda all out and have him be the great and mysterious master!
only questions remains: Obi-Wan told Luke he was his master ...