I’ve decided long ago against one Death Star for the whole trilogy, because of how central the attack run is in ANH, versus the one in RotJ that’s so sidelined it’s given to Lando. Lando can just be in some generic space battle but Luke has to destroy the Death Star. Sure, he could simply damage it, but that wouldn’t be nearly as satisfying. I suggest giving Coruscant a Rogue One style planetary shield and having Han’s team deactivate it from Endor so Lando’s team can storm the capital by ship.