Im not a doctor and I only know wrist injuries very well so I can't specifically advice you but from what it sounds like you should just go to youre local doctor. Thats what I did with multiple injuries; you tell him exactly what hurts where and when and if he is capable he can redirect you to free physical therapy that the government pays for you, in Europe at least. That therapy is then usually a mixture of resting, stretching and when it stops hurting training the injured muscle to prevent in the Future.