I agree with Jon, if you're worried about the stability of all those structures built on landfill, you may want to consider looking into homes/condos in Pac Heights where there is the highest concentration of properties built into bedrock. You may also want to consider other nearby neighborhoods like Nob Hill, Russian Hill. Though there are quite a few homes scattered throughout the city with reinforced foundations to deal with the damage earthquakes have dealt in the past. Either way good luck in your search when it comes time to buy.
A good real estate agent in your area should be able to help. If you wander into a few open houses on Sunday, you should be able to pick up some good information by chatting with the agents there and be able to remain anonymous at the same time.
To be 100% honest with you, the Marina is pretty unique in all that it offers. However, I would highly suggest Russian Hill because it has everything you mentioned except for the hills of course. You are close to Fisherman's Wharf, the shops/restaurants on Polk, plus you are in San Francisco walking distance to the Marina and North Beach. You can also throw in the "stability" factor.
Another area to consider could be Mission Bay. It is also flat and there are new restaurants; wine bars and new nightlife spots opening all the time. If you commutte south, it will take at least an hour off your commutte time each day. This is also why a lot of people from the Marina have moved over to Mission Bay. There are more housing options. The weather is more sunny and pubic transportation is easier. I absolutely love crissy field but the fog and expense of the Marina, when compared to the convienence and options of Mission Bay make it an interesting comparison. Check out the parks near the houseboats on Mission Creek. They'll be opening a new kyack rental/launch soon which will give better access to the waterfront.