I thought we may have stayed in the same riad! Ours was similar and we had similar experiences as you did. I didn't go anywhere on my own but stayed with my daughter. I would have got hopelessly lost in the souk. We spent 2 weeks in Morocco in 2019 and we could have easily spent another week. I learned La Choukran (no thank you) as I was only looking. My daughter ended up buying 10 coloured glass lamps!