Yoga will definitely help, so will weights. Exercises with a 'swiss' ball are also awesome, as they develop the finer muscles used for balance - like yoga does.
Don't forget rotor cuff exercises too, and push ups! Always keep the balance between front and the rear. Only training back and shoulders is asking for trouble.. Naturally stuff like running/cycling is also great.
People have different names for the exercises but off the top of my head with dumbells -> side raises, front raises, shoulder press, pushups, dumbell flys etc etc. Don't over do it I'd say. Rest is one of the most important things in exercise, apart from intensity and diet
I find I can get as much done in 30 to 40 minutes as someone else who trains with a partner at gym for 2 hours. High intensity, shorter time, works for the modern life. Many ways to skin a cat though... Good luck