first for the Yoda/Dooku battle.
I think that even though Dooku knows that Yoda is pretty darn powerful he still doesnt realize that even with his (Dooku's) darkside power Yoda still outpowers him. I think Using just the lightning scene would work. It could go something like this.
Yoda shows up confronts Dooku (some of the dialog could be cut/trimmed here, including the Yoda as Dooku's master stuff) Dooku does his boasting how the darkside has made him strong and given him all these powers the jedi dont have (blah blah blah, typical villian rant stuff

now a major problem i have with this is the amount of effort yoda seems to put into it. Seems like it took him some work, this shouldnt have really been a problem for someone with yoda's power. it seems to contradict yoda's comments on size not mattering from the OT. I think if you cut some of the scenes so yoda doesnt seem to take as long/struggle as much. basically make it so it distracts yoda for just enough time for Dooku to get on his ship and take off. also do something similar with the electric blasts if you can to reduce yoda's apparent effort...thinking about it i think they were like with a cgi yoda look at all the expressions we can put on his face so they made him look constipated while deflecting the electric and the crane.
also i think obi-wan's appearance needs to get cut after his injury (if thats kept in) Dooku only gave him two cuts one on his arm and one on his leg, yet he was completely helpless and couldnt even use the force to keep the crane from falling on him, i mean, the wounds were courterized (sp?) so not like he was week from blood loss, i can see anakin being out of it from shock of loosing a limb, but obi-wan just ends up looking like a little wimp that cant handle a little scrape.
one other thing is i could almost see getting rid of the electric that Dooku shoots at yoda just because it takes away from when the emperor does it in Jedi.
now that i think about it, this seen is filled with contradictions/problems might be better to just get rid of it

something along the lines of quick attack by anakin (similar to how it is in the movie, he goes ahead of obiwan irrationally), obi wan jumps in, anakin reattacks looses his arm, yoda enters, dooku throws the cran on anakin/obi-wan, yoda moves to save them, dooku makes his escape.