This is the story of Qui Gonn searching for a way to shake up and wake up the Jedi Council.
He begins the story running a stupid errand for the Council -- but he knows in his heart that the council has grown too beuraucratic and blind. He knows a tough time lies ahead for them, although it isn't quite clear what the threat is. He has been a thorn in the council's side for a while, not entirely sure what he's waiting for. This errand would seem unrelated to his feelings -- but it turns out to be the call of Destiny...
The errand turns into something of an adventure -- he ends up hiding out on Tatooine when he comes across a strange boy. The boy offers to pod-race to save Qui Gonn -- and Qui Gonn's interest is piqued. He goes for it (but he does NOT declare to Shmi that the boy is a potential Jedi. We'll use some of this scene later, but not where it is). Qui Gonn has more than one reason to let the pod-race happen: one is to get the parts from Watto, but the other is to see the boy in Action -- it's during the race that we insert close-ups to show how Qui Gonn is feeling more and more convinced: this boy could be the godda*ned CHOSEN ONE! It's only then that his faith in the boy is made certain. Until then, he's more "wait and see" (which would be set perfect if we could somehow move his "purchase" of the boy until during the race or after -- maybe we don't know he bargained for the boy until he goes to collect after the race?)
Anyway, he gets the boy free and tells the mom (this is where we use some of the "Your son is special" exterior scene from earlier -- it extends the pitifully short farewell material that's there now). They run from Tatooine to Coruscant and meet the council. But the blind council ignores all Qui Gonn's ideas and sends him back to Naboo (as suggested up thread -- this happens BEFORE Amidala makes the same decision and comes more from the Council's ignorance and spite than concern for Amidala).
Preparing for the battle of Naboo, Qui Gonn feels stifled -- the Queen's plan is too optimistic and stands little chance. He feels he must do as ordered, but that this is probably where he will die and the Chosen One will go lost --
Then Anakin goes into battle. Qui Gonn hadn't asked for this, but he senses it. He uses the force to reach out and help Anakin into the scary battle... they share a connection that allows him to fight (in a way) on two fronts at the same time...
But then he gets KILLED. Anakin feels it. Qui Gonn tries to stay in control of Anakin, but Anakin makes a bold move on his own and shoots the ship from the inside! But it works! Anakin flies out.
Obi Wan kills Maul/Grievous, then hears Qui Gonn tell him "the boy is the chosen one." Then cut to Anakin flying home with a final farewell kind of tone-poem in his head as Qui Gon passes. Anakin looks very hurt.
Yoda admits that Qui Gonn has convinced them to train the boy and the movie ends with Anakin's p.o.v. emphasised at every opportunity.
I don't know if we need Anakin's dream or not. But this "Qui Gonn finds and trains Anakin" story is the heart of the movie and everything else has to be peeled back and carved out of the way to allow this to happen.
The "mind" of the movie is still the "Nute Gunray tries to conquer Queen Amidala" story. These two threads combined will give the movie one complete STORY as opposed to the mish-mash that's there now.
Can the "council" consider and comment? I think we need this kind of "spine" settled to help us make other decisions and to know where we're headed.