I'll start by saying that CR is at the bottom of my list to stay at, so that may cloud my answer.
I'm going against the grain and saying I'd switch up to the Gran Destino at CSR without a 2nd thought. The new tower looks amazing. I had just stayed at the YC in early June and, imo, the room at the Gran Destino rivals the deluxe rooms. ( although slightly smaller ) With the addition of the new restaurant in the tower, the new dining over the water on the lake and all the bells and whistles as the new tower, it's a no brainer for me.
If you haven't seen it yet, I would watch the vlog that thetimtracker did - his detail is fantastic and also the review Craig and Fiasco did ( via dusunplugged ) on the new restaurant, Toledo.