As mentioned above re Boulevard, One Market is not technically water-front but right across the street from your hotel. Admittedly I have had more lunches than dinners at One Market but the food is consistently good, although not overly creative.