I just returned from both this week and I would say Citricos. We have been going to Cali Grill for years (at least 8) and it was one of our favorite places, but this trip it was miserable. Bad service, bad food, they no longer dim the lights inside during the fireworks, so even though we had the perfect seat the reflection off the glass ruined the "mood". Also, it was very "cafeteria-like" with noise. We had to shout to hear each other and we were not in the middle of it all.
Citricos was awesome, although there is no "view". Our server was amazing, sneaking us out the back door to watch Wishes, we received a tour of the Chef's Table since it was not booked and the food was fabulous. Plus we could hear!
Both places do have great wine lists though. CG obviously heavily on California Wines. I am hoping that night was a fluke, but I am not going to chance it again on my October trip.