i had an injury in my shoulder in july, i gave it 1 month off and since then ive been training moderate level, there are days i feel more pain than others, im not fully recovered this will take time...
Be pacient, because injuries take time to heal, you will suffer with your psicological, but thats part of it.
If its still swollen you can take anti inflamatory in couple days and go for some ice. But dont go on forever with anti-inflamatories becuase they will make your injury worse.
Get it checked out, see if it was a tear, a tendon, or cartillage stress.
SOme people like heat, other prefer cold, scientifically there is a big contradiction in whch one you should use while healing, for me i feel better with ice aplication 20 min 2 times day.
Best of luck, injuries suck, but you will be ok.