Faith on Angel definatly, she and Angel have a lot in common, and she's such a great character, they would be great together (not as a couple though, that would ruin Angel's vibe) For buffy I'd like to see Tara again, as a ghost or something, she's so sweet