I would not remove Death Star II. It’s iconic, it’s something that’s a big part of Star Wars, like it or not. I mean, it’s even the logo for this website.
Yes, I agree it’s more iconic than DS I due to its more interesting design, but I can easily think of it as DS I while still under construction.
A crazy thing to do would be to restructure the whole original trilogy so that DS II is DS I under construction, and combine the final battles of ANH and RotJ. Not sure that would work out, but…