I vote for Citricos. I went two weeks ago for the second time; my parents also celebrated their anniversary there at my recommendation in January. The restaurant nis a lot cozier, the food exemplary, and the service outstanding. in fact, the service is so good that it made the food taste just a bit better than ita lready was.
Flying Fish is wonderful, but the service is erratic. You might be unlucky and get a distracted server. I know this can happen at any restaurant, but Citricos seems to work a little harder at preventing it