Oh I'm fully aware of some of the downright awful decisions made under Lucas himself. Stupid ideas are stupid no matter who makes them. Those dancing sequences and things like Detours both make my skin crawl.
I think both actors should keep the new lightsabers - no swap to standard blades- swing like h@&ll at each other, and tangle them up full on Spaceballs style.