I Have Been To My Primary Dr. For Extreme Shoulder

I have been to my primary Dr. for extreme shoulder pain. He put a shot in rotator area to numb it and stated that I may have a strain on it. Work sent me to their Dr. who stated that it is my muscle across shoulder that needs acupuncture treatment and it is not the rotator cuff. This pain is now across my shoulder and to base of my neck. shoulder pops and grinds. 2 Dr.s 2 different opinions and I am still in pain. One says ice and heat the other says just heat.