Yea, going to Hell counted as Death. She surely didn't think she'd see him again, in any case- and in S7 she SAYS "I killed Angel, anyone remember that?" I always saw that moment when she deliberately put a sword in the first guy she ever loved as the defining moment for Buffy's adulthood. One could argue she never has been the same since.

Very lovely analysis of all the deaths, btw. Thanks for sharing it.