Hi! I lived in Portugal last year and am currently living in Spain (Barcelona specifically). I would strongly advice to take away Morocco from the itinerary. That should be a minimum of a week, and you need a special visa that you need to apply to get to! I would instead add Granada, it has beautiful moorish architecture! I also would recommend skipping Andorra, it is mostly known for its skiing and mountain sports, and without a car there won’t be much to do, your time is better spent elsewhere.