Angel is learning to be his own man because if he's going to attach himself to Xander instead of Buffy, Xander will never take the lead.

And you're right that Angel does better with friends than lovers, although I do hope to show Xander and Angel moving together in a healthy way once Xander is older... and less repressed.