I forgot all about that. It's pretty appalling for critics to say LEGO is promoting racism because a fictional character's fictional home slightly resembles a religious landmark. I can understand the reasoning behind LEGO pulling it though, it's just best to avoid controversy, especially when at the end of the day LEGO is all about having fun.
Anyhow, perhaps a larger Sail Barge then. With a couple of skiffs, sarlacc pit, and detailed interior section or two where Jabba and Leia's scenes took place. You can still have a lot of the minifig opportunities there too. Though I have heard that Lucasfilm no longer licenses the Slave Leia look, so that could be a big issue.