Your movement of the entering of the Jedi Temple actually coincides with an omission in the score.
If you compare the film to the cue "Lament," that EXACT placement is where a pretty hefty section is omitted.
I tried fooling with it myself to see if I could emulate what you've done and you know what I found, the movement of the entering of the Jedi Temple nearly perfectly fits that omitted moment, and then the return to Kashyyk and the music there is exactly how it should be.
Only problem is, the music doesn't quite feel right which may partially by why its changed in its placement.
The other thing is that there are obviously two different performances of the same cue. Lament on the album omits a segment and at first I thought it was an edit, but I'm noticing that the whole performance starting at that omitted moment seems to be slower on the album than in the film.
but anyways... I'm sure you've noticed the omission of the score... but anyways, thought I'd chime in.