In reply to Giacbold:
This sounds frustrating!
If I was you would do lots of eccentric exercises with standard elastic bands. (Google it). Keep that joint mobile. Sometimes pain can lingure on well after an injury has healed.
Try hot and cold treatment after the exercises, a gentle rubbing with ice cub on the sore area combined with alternating it with holding a mug of very hot water works well. Try and achieve extremes in temperatures as much as you can handle.
Before bed rub volterol gel on the joint but don't massage it.
As to climbing, I would keep on with easy stuff. It will help the process and keep you happy, just make sure you are always warmed up well.
Don't do any manipulation of the joint before climbing, do any treatment well after climbing .
All the best
Post edited at 08:47