I have an idea, what if all of Count Dooku's appearances are replaced with Darth Maul, making him a main character. Remove the rest of the battle in TPM where Obi-Wan kills Maul, and instead have him run away while Obi-Wan is stuck behind the red shields.
It would take quite a bit of editing, and a lot of tweaking of dialogue, but it'd be interesting to see it done.