The boat back was a serene voyage surrounded by dolphins. All the more bizarre after being tear-gassed in Tangiers