Is this an ok itinery?
#22
One more thought. You may want to use some of your Gibraltar time to take a day tour to Tangier, Morocco. It is easy to do in one day. The tour will go into the Souk which is typical of its type. If you have never been to a souk will find it very different and interesting.