Another great thing about your edit is that it also turns the jedi into detectives who suspect something is up and they're going to Kamino to find out about it.
By moving up the emergency powers act, you've also kept the momentum going because the assassination attempts just happened. In the existing film, they were presented so late and so far after the assassination attempts it just seemed to languish.
Are Padme and Anakin already gone to Naboo in your edit brash?