Poor Buffy seems so cynical, almost Wisheverse Buffy in nature. And I can absolutely see that being the result after everything she'd been through.

I'm so glad you agree with the characterization. I don't think she ever really climbs out of the slump she's in in S6; too much awful stuff happens in S7 for me to believe she'll ever really be the person she was before. And Wishverse Buffy makes me sad, but I love her. I doubt Angel could help loving her also.