I believe they overlap. All three. They are both Cluster B. So they fall into same category

I knew two people with BPD, formally diagnosed. Both exhibited sighs of other PDs. I know people with tendencies and traits of different PDs. (Suggested by professionals) Might not be formal diagnosis

And I often read how some people describe their partners on these forums and they often appear to have combination of these PDs.

So I’d say your partner might have a combination of traits