ThxYou need to complete "Not So Safe Anymore" and do not have Amy onboard just stay away from her quest until you get every quest done that does not require her or it will break some of the quests.
But i dont start Amy quests, probably some is broken. The walktrougth is clear but i cant complete these quest.
I must restart ...