My only advice brash is to make a list of things you want to do with this edit and pursue one until it's done, then cross it off and move onto the next one. If you try to do too much up front, you might get bogged down and overwhelm yourself.

In other words:

Do the jango thing, make the jedi less stupid, and then worry about lightsabers and all that flash.

AOTC's problems stem from characterisations and plotting.

You are on your way to correcting that in a very good way.

Stay on target.

I want green sabers!

Stay on target.

I want new dialogue for 3PO!

Stay on target.

Loosen up!

Arrgh!