Keep khayrya in reserve for a slower itinerary through Safi. It works naturally as one stop on a broader local-history route.