Hi Jeremy,
When we were planning to do Morocco a few years ago, my wife had considerable contact with a Moroccan tour outfit called Desert Majesty (
http://www.desertmajesty.com/). They seemed like very interesting and knowledgable people and we will probably use them if we ever get our act together.
I hope you have a great trip, with lots of photos.
Eric