So another San Fransisco location is Kirk's apartment. The problem? It's on the same side of the bay as Starfleet Command! I guess he wasn't coming from home at the beginning of TMP, or he moved. ;-)
http://www.filminamerica.com/Movies/StarTrek/02TheWrathOfKhan/
If my locations are correct, it looks like he just happens to be staring out the window at Starfleet Command in this shot, which is perfect since he is considering his own mortality at the time.
