I have been unable to complete Nick Valentine's affinity mission, Long Time Coming. I am at the point in the quest where the next objective is to "Talk to Nick"; this is just after I have collected all of Eddie Winter's holotapes. Basically what is happening is that I cannot find Nick anywhere. When this is set as my active quest, there is a waypoint near Milton General Hospital to "Talk to Nick". I go there, then I don't see him even after waiting nearby for several days (just incase he is walking there?). Then the other thing that happens is that when I am not looking at the map, there is a different waypoint on the HUD; this brings me to the elevator in the Mayor's office at Diamond City. Note that Long Time Coming is my only active quest.

So, basically I can't find Nick and the waypoints appear to be broken for me.

Other things that may be useful:

- I completed the "Reunions" and "Dangerous Minds" quest long before.

- I reached Idolized affinity with him before dismissing to Valentine Detective Agency so that I could use Deacon.

- Couldn't find him originally while collecting the tapes, so I figured finding all would make him magically reappear.

- Completely cleared out Andrew Station above and underground, as well as closely surrounding areas -- no show.

Any ideas on how to find him so that I can complete this quest?

Any help is appreciated and if there is anything else that might be useful for me to add, let me know.

NOTE: I am on Xbox One.