Your symptoms suggest intrarticular soft issue pathology.
Try:
1. Regular shoulder exercises
2. Ice pack application will help
3.Medications like Tendocare and Enzomac forte will help.
Next Steps
Go for MRI... if will clarify the pathology.
Health Tips
Do not worry. You efforts will not go waste..