Nicky, if you see yourself reflected in avoidant traits, talk openly with your therapist. (S)he will clarify your doubts. You can arise any topic with him/her.
(S)he is the best in diagnosing you.
Most of the times, personality disorders are not found in a pure way. And perhaps, you could have a tendency to avoid situations but you also would have to work on issues that has to be with the first diagnoses you recived.

Don't be afraid if you have borderline traits. They are treatable.