My vocabulary is very good (professional translator), but I can definitely relate to blocks making me swap out good words for worse ones 😅 It gets a little easier when I'm around people who are accepting of my stutter, though, because then I feel more comfortable taking longer to say what I want to say (unless it's a really really bad block). I wonder if practicing with other PWS could be helpful for you?