Checking in with another vote for LeCellier.
Besides bland food at Marrakesh, the service was abominable. I feel that if I ask for a glass of water in a restaurant, the server should not ignore my request. I was completely and totally ignored there. Like as though I were invisible.

DH asked for my water and wound up ordering for me because the server refused to acknowledge me. I understand the whole aspect of cultural differences but this was way too immersive for me.
The restaurant is absolutely beautiful, and the dancer and music were entertaining and different. However, I was ready to cry when we left. We could not eat our meal quickly enough. It was so blatantly, over-the-top rude that we didn't even want to speak with their management about it. Suffice it to say, we will not make the mistake of eating there again. Ever.
At LeCellier, service was outstanding the 3 times we've been there, the food is well-prepared, and the desserts are really delicious. Have a terrific time!