I'll need to go back and rewatch the clip to answer question #1, but, in response to rearranging the Jedi chamber sequence, it's an interesting idea. However, the way it plays out right now, there is too little action that occurs with Obi-wan to account for the larger amount of time which passes for the chamber scene. Maybe you could cut back and forth between the two to make this less noticeable?