I'm really sorry to hear about the problems you are having with your psychiatrist and therapist. If they aren't listening to your concerns, you should indeed try and find new ones if you can.
Also, it is possible to have both social phobia and AvPD, and labeling isn't necessarily the important part. Just make sure they deal with the specific issues that are biggest for you, even though they may call them social phobia and you may call them AvPD. Your therapist should really listen to who you feel you are and your concerns, or you therapy isn't going to work out.
I hope things start turning out better for you.