If you are in Europe, you should contact both Mark Smart (England) and Imre Szabo (Germany). They specialize in old pianos (Mark mostly Bechstein, Imre does mostly Bechstein, Bosendorfer and Bluthner). Watch out for cracked plates, this can be repaired but you are wise to choose the piano that does not need this.
If you are not in Germany or England, I hear that rebuilding in Poland may be worth the distance, although I have no first-hand experience.
I dislike the Steinway S, I think it is a sorry piano. Steinway O would be the only Steinway I would consider in that size (I grew up with one, so I have an indulgent bent for it).
I would take the Yamaha c3 over Steinway S, but you have much better options (Estonia 190, August Forster (not the Czech version) 190, if in America: Mason & Hamlin A). I would even take an old Kawai over the Yamaha. I would take a new Irmler (it feels like an old piano, really) over any of these.
You don't sound like a Chinese piano kind of person, so I won't go there.