I think Star Wars Land should have featured multiple areas dedicated to different places and areas (along with room for expansion for future characters).
I'd actually model the land similarly to how SNW was built... multi-level, tall and easy to "switch" between locations and eras. There's no reason why there's a giant Diagon-esque marketplace, all of those shops (Kat Saka, etc.) could have fit into those empty facades next to Oga's & Savi.