I've been back 6 times now. Cleared it from different directions.. in different ways.. no Grace. At all.
I've restarted and come back into the area, I even went to her bunker. Nothing has worked in getting her to show up.
I'm sure the icon on the map is annoying, but being unable to even obtain her in the first place is maddening.