So I had a "radical" idea for both the OT and the PT (in making it less redundant and connection it more together):
first I would drop the second Deathstar - moving the battle to Coruscant (to the end of RotJ), like it was meant in the "first draft" - the duel would then be on the planet or inside, what works best.
as an alternative to removing the half-finished DS, there could be 2(!) - one unfinished, more open (maybe just the super-laser) and one finished (hidden in off-sight) There should not be the complete imperial fleet in orbit.
Connecting with the PT: maybe replace the droid-control-ships with "space/battle-stations" (foreshadowing the first DS)
instead of just showing the plans for the "ultimate weapon", let them build a prototype, not as refined and big as the real DS, but close enough for Obi-Wan to recognize years later, how similar in design ...