I too would choose Aqua over Farallon. I've dined at Farallon 3 times over the years and the food has never been inspiring, in fact, other than the interesting decor, which is worth a look, the food is rather boring.
Aqua and Farallon are right around the corner or so from one another ... you should take a peek in Farallon and walk to the back of the dining room, which use to be an indoor swimming pool many many years ago. Note the very nice tiles on the ceiling.