You might also consider the extension to Essaouira. We took this trip in the fall of 2009, when that was a pre-trip add on. Seeing the communities along the seashore made an interesting contrast to the inland, desert portion of our trip. We loved Essaouira, with its old fort, good food, broad beach, and interesting history. For us, these few slower days of touring gave us a chance to get over our jet lag and to relax before the more strenuous desert travel. At the end of a trip, as it is offered now, I think it would be a delightful ending to the Morocco trip, and you would enjoy the sea and the breezes after all the heat and sand!