In buffy the vampire slayer, does angel came back?

Well, I know that Angel has a soul, and in order for him to lose it, he has to have even just a second of pure happiness, and he sleeps with Buffy, and gets it. Now his soul is gone. And to get it back, willow, zander and Cordelia, must preform some ritual thingy, and he gets it back, just before buffy kills him, but then they kiss, and she shoves a silver sow rd thing in him, and he goes into this big stone thing. My problem, is i think he is hot, and he is my favorite character, does he come back?