I stayed at Capella Pedregal last year and had a fabulous time. I found all of the staff to be wonderful, particularly Marisol at the front desk/personal assistant department.
I am on board with Raffles, and don't think it is really fair of you to assume that your credit would be cumulative, though I do understand where you are coming from. In the end, they should have stated the rules ahead of time and there would have been no question. There's really no value for either party in vaguely communicating terms of an offer.
I think Capella Pedregal is a fabulous resort, and I would certainly return upon going back to Cabo (I'm just not so keen on Cabo, so I'm not sure that I would). And Esperanza? Are you out of your mind? I guess we all want what we want... but I've never been a fan. I think you should have taken it with a grain of salt, moved on, and went to enjoying your vacation. I can't imagine you got a better deal at Esperanza.