Spike fer sure. Angel was a good character, but if you're asking who was better for Buffy, then def Spike because while Angel was busy being all dark and broody, Spike was trying his damnedess to evolve into the "man" Buffy wanted and needed. So my vote is for Spike!