I would vote for CA Grill because I haven't been since the refurb. I loved CA Grill before that and have high hopes for it. I've been to Citricos only once, but the experience was below that which I've come to expect at Disney Signature restaurants. It took a long time to be seated (45 minutes after ADR), the meal was slow (3+ hours for a three course dinner for three adults), one member of my party had to send her entree back because it arrived at the table cold, and it was very noisy. Overall, I'd like to say I'd give Citricos another chance, but it's hard to risk wasting a second dinner when there aren't that many dinners at WDW to begin with.
In truth, none of the WDW Signature restaurants are really going to be "date night"-like (at least, not in the candlelit, romantic, soft music style). All Signatures welcome families, so you're bound to run into small children (except at V&A). Most of the kids are fine, but it's possible that you'd also have dinner next to the kid that's tossing food about, doing jumping jacks in the aisles, and/or screaming at the top of his lungs (yes, I've seen all of these at different Signatures over the years). I'm just saying this so you can be prepared for the worse (but hope for the best).