Yes I do think he has feelings for Faith, I think you can tell that in Season 1 (I think it was because I haven't seen all the seasons) when she put Angel, Welsey (and Cordy) through all that trouble. Remember that street fight between Angel and Faith? That was intense!