i started taking mdma occasionally sometime last year and to be totally honestly it has killed off any sense of anxiety i had beforehand maybe not the best advice but it helped me alot
I think you have to be comfortable in terms of your surroundings and the people you are with, so to improve that you may need to step out of your comfort zones to stop you feeling anxious