I don’t know if this has been discussed, but I’ve been toying with the idea that instead of a second Death Star, it could be something to the affect of the Imperial City floating above Endor.
It could be the complete center of Imperial Power. A place Palpatine stays. That way if you destroy the main hive of the Empire, it’s a much bigger hit. There’s some finality to destroying their headquarters. I wouldn’t have it be weaponized, just protected by the shield on Endor. You could have the movie play pretty much as is, but change the mention of a Death Star. It really wasn’t a looming threat for Endor, at least.
That’s one of my dreams, combining this with the new battle scenes on Endor would really improve rotj imho. Even better, reverting to Lucas’ original idea of Endor as the moon orbiting around Coruscant could work well with the celebration scenes on the capital, people would actually see the destruction of the emperor’s space station/seat of power.