If there is a way to remove the DSII in a quality way, then I would be ok with that. I would be afraid there is not a way to make it look believable or done perfectly to justify it.

I admit when it comes to lightsabers I never personally cared about the colors and whatnot.

For the Obi Wan once that as you do matter, I think I would try to change it to mother. I would not use Padme’s name. That name would mean nothing to Luke, it would have more impact if it was “mother.”

As for the First Order stuff, I would try to show Star Destroyers fleeing after the battle, that would help with the concept of the “early” years of the First Order.