I'm confused about how you are reading this. To me this scene is set before the Whistler scene in the Riley one-shot. Angel is clueless because he's been thrown back into a world that's been reset. Whistler later tells him about a bunch of other possible timelines.

Angel did get insulted about being doggedly simple (i.e. the easiest pasty for the PtBs to go after).

I share your worry in your last paragraph, but an waiting to see.