I had a wonderful stay at Janina's place. It was clean, closer to everything that I needed and Janina checked up on me every morning.
There is a Food Lovers Market eatery just downstairs, and it is less than 2km from waterfront.