I have to say that the concept of a second DS is too derivative for a ROTJ:R.
You can’t just get rid of the Death Star II and make it completely seamless, because it’s interwoven into the plot, dialogue, and action scenes. It’s something you can only change at a script level.