Thanks for the follow-up.
You can try gentle massage and warm compresses on back of neck and shoulder blade which can provide you relief however it can be temporary.
Even you can take OTC Motrin.
Physical therapy can be helpful.
It's good to get a X-ray which gives you a proper diagnosis.
Now regarding your swollen fingers,so possible causes may include Strain due to repetitive injury from overexertion,Gout,Rheumatoid arthritis.
So these symptoms may require a medical attention.
You can avoid physical activities for a while.
Also soak your hands in warm water for 10 minutes twice a day which relieve swelling,stiffness during making fist,pain.
Motrin can also help.
I suggest you to make an appointment with an Orthopedist for further evaluation and management.
I hope this helps.
Please rate me highly (Star 5 Great Service), if you are satisfied with our conversation.
If you have any further query then feel free to ask.
Bonus and positive feedback are highly appreciated.