I personally appreciate the mind games involved in the ep (maybe a little toned down). I think a tasteful way of doing this is to have the first part of the dual scene earlier in the movie (dream, memory, whatever) and then in this finale use it as a memory (like in the original) and as a call forward for the audience, pulling them into the fact that they now also know why obi would know what vader would do.

I think we still need the mind games, master and apprentice parallel in the final scene to drive home what is said in ANH, and I feel like the way they did it was cool if not a tad ham-fisted. So if we treat it almost like a reveal (show in the beginning, audience forgets about it until the end when we show the whole scene, so everyone gets payoff) we can rectify the problem with the original…it feeling thrown in with no previous build up.

Creating our own mini Setup and payoff.
Needless to say I think this would work really well.

P.S. great scoring! well done loving it so far, it might be a tiny little bit too loud though, just a tad bit over powering of other elements.