I think you're doing the right things. If your inflammation is very bad (I hurt my left shoulder last year doing yoga too, lol) I suggest a 'blue' ball because the color blue is cool and calming. But it sounds like you have a good handle on it.