I'm keeping them as close to how they were composed as I can, within the limits of what can be done while maintaining synch to the picture. I'm making an effort to avoid rough/jarring edits if at all possible.
I've already managed to get the probe droid launch and imperial fleet cues synched up—given the extreme changes in timing from the final film for those scenes, editing them to match up while still sounding musical was no easy task, I can tell you. But they came out better than I expected, so I'm happy. I just realized that ABC's tracks seem to be running at too slow a speed compared to the film itself, so I'll have to account for that in order to keep everything lined up.
Edit: looks like the speed issue is more complicated than I thought, so it's gonna have to be corrected manually for each cue. Dang . . . well then, Elastic Audio, here I come.