Welcome back to it Owen!
Here’s what I do, having had both issues in the past.
Shoulders:
- dumbbell shoulder press (lightish, 10 reps). Sometimes one arm at a time for more core.
- dumbbell lateral-to-front raise (light weight, straight arms, slow w good form, 10 reps)
- pressups, widish
Elbows:
- theraband external rotators (elbow by side, bent at 90 degrees, rotate from fist on stomach to fist just beyond body).
- reverse wrist curls (lightish dumbbells)
I find that to be enough, any more and it rarely gets done. I typically do two sets of all at least twice a week after training; three sets if I have a lot of time and didn’t have a hard session, one if I’m beasted and/or time strapped.
Having said all that, a big part of returning to climbing without injury is moderating volume and intensity. If in doubt with niggles, an extra rest day is better than an injury and often lets you climb more strongly.
HTH, good luck with the return!