I think the easiest solution is to combine planets. Tatooine=Jakku=Pasaana Naboo=Takodana=Ajan Kloss Redesigning the planets would take a lot more work.
I still don’t think this is a good approach. Space is big, I don’t want to shrink the universe to just 7 planets. And it would be weird for the Rebels to establish a base on a planet that’s about the opposite of “hidden”.