Marrakech moves fast in terms of new places to stay, so always good to update.
There continue to be no end of cool new riads. I would probably still take Riad Farnatchi over most others in the medina, but I am pretty sure at least 3 new ones have opened in the last 24 months that are probably also pretty good.
I don't think the Royal Mansour is to everyone's taste, though it is a pretty hilarious place. It suffers a bit from being a bit too stiff, though the grounds and interior décor are spectacular. If I am looking for luxe hotel in the city and not Palmeraie, I think I would still look at Mamounia though it is not perfect.
In the Palmeraie, total toss up between FS, Aman and I guess Namaskar (though I haven't seen that one).