Yes, if you can get a photo of the building with the "90" address visible, then it would be fine to change. I'm not sure what the postal city would be in that case, though—I guess San Jose since the nearby Cupertino addresses are all in the 100xx range. And yes, a separate point for the other address would be good too.