Morocco gives you more of what you are looking for. The old quarter of Fez visually is the real deal, but again, I wonder if the oils sold there are really just synthetics from China.
Marrakech is quite lovely. The leather tanneries are quite something, that is if you have a strong stomach.
YSL's Jardin Marjorel is stunningly beautiful; perhaps you can score a bottle of Opium there. Monsieur Lutens has a foundation somewhere in Marrakech.