how I wish I were you, we have just come back from our 4th visit in 2 years and I can't wait to go back again.
we've been round the region you are mentioning and if I were you then allow some more time, at least a few days in merzouga. the dunes there are phenomenal, you'll see on the camel trek but we loved it so much we stayed on... see if you can spend a night in a berber tent, have dinner with them, maybe some music, the stars are so clear, sunrise if you're lucky...
or you can take buggies out, hot air balloons, sand surf, whatever mode of transport you like!
have you got the rough guide to morocco? it's shown us some real treats.
bon voyage