In the last two episodes. He came in "End of Days" for the last few secondes and kisses Buffy. That episode ends and he is in "Chosen" for the first few minutes until Buffy tells him to go and fight his own fight.
Angel WILL EVER BE in Buffy, 'cause he's inside of her since he has been her first l’amour and lover. The development of Buffy throughout the series is deeply intertwined with the relationship she had in her life, all of them less ou plus building on her personality (yeah, even that Parker scumbag).