I don't have the exact same problem, but have (had) similar aggravations that probably could have been prevented by 20-20 hindsight.
If you're comfortable not seeing the doctor, I've found
this stuff to be effective. Just rub over the affected area before workout and you'll be good to go, although lator on you may need another dose. They also have 2 stronger versions in stock if you're adventurous.
The other thing I do is a couple of light, 20 rep sets at the end of the workout to stretch the muscle. Don't use a weight that's going to cause strain, just enough to let you know it's still there. The active recovery concept. It seems helpful.