We have decided not to cross into Morocco and to add those extra days to Spain, but could anyone recommend any places for good buys on Moroccan carpets or rugs? Thank you.

There is a shop [in Madrid] on (I think) c/Ferdando el Catolico close to Moncloa end (some excellent prices when they have sales/rebajas). There is also a store close to Bilbao metro on the street that leads directly to San Bernando.
However this info is possibly out-of-date!