On a redemption ticket, you are allowed either one stopover OR one open jaw enroute to your final destination, which in this case is Madrid.
It is actually to CP's advantage if you openjaw - because then they do not have to give BA any revenue for the flight which you will not be taking. I'd check with them again.
Otherwise, go with Rudi's suggestion.