The Reavis Group
But, before you start working, have an experienced, San Francisco Realtor, who really knows your market, walk through the property with you, and let them advise you on the best course of action. If your plan is the resale value, it is never too early to get the advise of a Realtor who really knows the market.
Consider the demographic of the eventual purchaser. Couple, two large rooms. Couple with one child 2 large rooms bring in a second child especailly differernt sex and you need three rooms. But in reality that is when lots of people move so. I'd go two nice rooms and nice bath for you in your neighborhood.
Be sure to work with an architect and don't ruin the details of the building.