We would be happy to miss both Agadir and Casablanca if there is the slightest doubt about safety.
Margo is right we did live in Gibraltar for 3 years and found it a fascinating place, we would be thrilled to go back for a visit! We picked a port side suite so that we could wave to the old place as we cruised by! Maybe now we will stop there.