2x16 is "Epiphiny", right after Angel bangs Darla and then has a... well, epiphiny. He puts an end to his recent dark behaviour and rejoins the rest of the team.
I've been enjoying the After the Fall comics, but I admit that I too occasionally find them hard to follow. Nothing major, but just a few plot points that don't really seem as fleshed out as they could be... and sometimes the action is a little confusing.
I recently read the Aftermath hardcover collection, and I didn't find it to be as bad as Ethros apparently did. It wasn't as deep, dark, and heavy as ATF, but I think we needed a bit of a break from that anyway. I will agree that some things felt out of place, like the presence of actual angels... didn't seem like a good fit for the Buffyverse, IMO. Angel dealing with his newfound fame is kind of interesting, and funny at times, though.
So, ten years since the show premiered, eh? Man, how time flies. I remember watching the first episode when it aired, being mostly impressed, but unsure if I'd ever take to the show the way I had Buffy. I was quite pleasantly surprised to find myself actually preferring it to its predecessor in the later seasons... even more surprised to find myself liking the character of Wesley, who I thought was an annoying twit on Buffy. So thanks, Joss and co., for exceeding my expectations and creating a terrific and memorable show.