I'd be careful pushing for a personality disorder diagnosis. In the US, at least, there's a lot of stigma associated with them.