Yes. And Grace even said that she was warned by her future self that Dani would not be ready for this but she is no longer that Dani. I think for example a lot of people right now are being activated by oppressive situations and excelling in ways they could ever imagine due to the necessity of collective survival and in the absence of effective leadership that makes people feel like the future is secure.

I liked Grace's character, especially after falling in love with all the characters in Halt and Catch Fire, I can see the director being like yeah we need that energy for this character. She has a certain wit, tunnel vision and stubbornness that is needed to complete certain tasks.

Sarah, at first I wasn't sure about, she is sort of antiquated but so is the T-800, but she isn't stubborn just battle worn and resourceful.

And as far as Dani being cuddly, who the fuck cares. She was a working class person who cared about other people, and you need to have a certain level of openess in order to be an effective catalyst for change in peoples lives, present and future. I wonder if she had sent Grace back at that particular period of time because that was a special point in her life where she felt empowered and not burned out and jaded.