Yes, I'm afraid that's the LOLIPOPS theory (Love Of Lily Is Poluting Our Poor Severus), or a varient of it. I was really hoping that Snape came over because he had a moral revelation, not just because his actions finally wound up rebounding on himself. It's a very selfish motive, when it comes down to it.