That's fine as an explanation, Bingo, but how would it be conveyed in an edit?
Having Gunray as an antagonist in Episode 1, and on Dooku's side in Episode 2 makes it very challenging writing Dooku as a good guy. Along with all the other stuff too. :-(
Edit: In reply to your idea about the droid too, if it can cut a hole in a window, then it obviously has technology capable of penetrating the 'glass" so why not just shoot her with it? :-p