I’ve actually been toying around with this idea. I’ve elected to make my Rogue One edit into episode III, but I’ve been thinking of just having Star Wars movies that remove the “episode” part. Fixes a lot of issues.
I’ve considered both of these ideas. I’m actually holding out for these star wars stories to give me at least two more pre-classic trilogy films that could work as EP I and II. If not, I may drop episodes numbers as well.