I've heard of Ifrane and Essaouira (both of which I hugely wanted to go to), particular because I love to windsurf but unfortunately I didn't get a chance to go. Maybe next time! But these other places that you mention seem absolutely gorgeous. I've given them a quick search and Oualidia doesn't even look like Morocco anymore. But saying that, neither does Ifrane. I agree with you, it looks like a village in the alps more than a Moroccan town.

Hugely envious that you managed to spend 2 years in Morocco, I bet you've seen some things whilst being here. Keep on travelling, friend! :)