Should Angel have Kicked Connor Out?

What I find especially interesting about Angel kicking Connor out, is even though the circumstances are different, there's a striking a parallel between Angel telling his son to leave his house and Angel's own father doing the same to him once upon a time.  And oddly enough, Connor likewise is taken advantage of by an older, evil woman....

Still, while his actions aren't blameless, and still acknowledging the fact that he could give Dawn and Wesley Crusher a run for their money when it comes to obnoxious character; the thing that gets me is that Connor is ultimately nothing more than a pawn in how any of this plays out.  He never stood a chance, to borrow a cliche.  He's robbed of having any kind of well adjusted upbringing, yet despite that it looked like he was on the verge of bonding with Angel before Holtz came back from Quor'toth.  And even then, if Holtz hadn't been such a dick and staged his death to look like it had been at the hands of Angel, it's still entirely possible Angel could have gotten through to Connor and built something with him.  Sinking him to the bottom of the ocean is hard to forgive, but at the same time a significant portion of the blame rests on Holtz and Justine; Connor was acting on honed instincts that were lead astray.

It doesn't even seem to be a matter of trust or safety, which was the main premise the people in the other discussion focused on.  They honed in on how Connor went after Fred in order to escape, which was arguably more defensive than malicious; and they apparently didn't deem him much of a threat, that he could be relatively trusted not to hurt Cordelia when she turned to him without her memory.  He wasn't on the same threat level as say, Spike or Andrew during the same time period over on Buffy, who had to be bound or chained.
I'm not sure what keeping him around and trying to rehabilitate him would look like, but the more I think of it, the more that seems like the better alternative.