I hope (for my sake at least) that you are both right, but I'm having a hard time forgetting the look of hatred and revulsion that Snape had looking at Dumbledore right before he killed him.