Tarifa is (at least it was the last time I was there) a charming town and a great point of departure for a short hydrofoil ride over to Morocco. Tangier, your landing point, has much to offer but some touts to weed through as you get to what you want to see, but a trip to Fes might be worth adding to your schedule if you do consider this add-on from Spain.

Joan Peterson