New plan will preserve historic San Francisco General Hospital