Cordy
I think he is. A vampire is a demon that retains all the person's memories and personality. His soul wasn't present when that happened and he'd already achieved Shanshu so I think Angel got a good eternal reward, just like he deserved. I refuse to believe any differently because of all the good he did.