Good point, but rather than erasing Dooku, I would add him to Episode 1 (as Bingo? once suggested) ...
I really like the thing you did with the duel, it solves some problems.
the upside of characters like Maul, Vader and Fett, is that we could recast any actor and put them in costume or armor ;-)