Could you somehow remove Jar Jar from Tattoine entirely? (lets say that he never left the ship as since he is useless he has no purpose fallowing them along.) And remove little Anakin from the final battle? (lets say that he stayed at the Jedi Temple. Because why would they bring a child along to the war zone?)
That would make the movie much much better I think. (I tried to do just that in my edit but I no longer have the time)