I’m so excited for you Robert! Morocco is an incredible country! My only suggestion would be to try and get to Chefchaouen. I don’t know if it will fit into your itinerary but it is the blue city that you have pictured and it’s our favourite place in the country. Also, on your way to Agadir, be sure and stop off in Essaouira. The Medina is fabulous. I’m looking forward to your updates about this trip!