My only issue with removing the Jakku is that without it there are no planets representing the sequel trilogy. Personally I would’ve liked to see Canto Bight added on top of the existing ones, and a prequel planet like Naboo or Coruscant.
As for ROTJ, have you tried removing the Galaxy celebration scenes but keeping the SE music track? Maybe it’s because I grew up with the SE but I prefer the newer John Williams track to Yub Nub.