Your gettin a good handle on it. No jumping with the shoulder, keep the flirt pole down and do more swimming to heal that shoulder less hard impact stuff.
Diet wise.. yes your good not liquid, nor powder .. somewhere in between. The fats shouldnt be eatin alone just some days more fats. Be sure to include pototaoes and greens or rice and greens. hanldwalking and swimming, light ball action keep it low.
For a dog that likes to jump, its easy to damage a joint, ligament, or muscle in flirt pole, spring pole, weight dragging can do this also if the weight is too much.