Sounds very good. But I'm a little worried then that AotC might lose some key scenes then. Though I understand it is necessary to enforce menace, it being as flimsy as it is. How do you propose to rearrange AotC with this in mind?

Perhaps this would be too radical, but maybe you could consider making this into a duology? We've all felt at one point or another that it would be wiser to simply take the good bits we have, and discard the dead weight so we can at least make one or two good movies. What if you split the AotC up to enhance the other two?