Ah, you don't know what Whedon really planned with The Gift. The initial plan was that Xander play the Ben role, and house Glory. Willow go all DarkPhoenix and become the big bad. So...Buffy would have to kill Willow, then herself to save Dawn. Giles would have to kill Xander to prevent Glory from returning. He also originally intended to kill Xander in S7, but his writing team talked him out of it.

Whedon is bloodthirsty writer. ;-)

But I hope you're right. I'm not particularly looking forward to the bleak ending that apparently started the Frayverse. Plus we are supposed to be having a S9.