Thanks to everyone for the suggestions you've made. While I don't mind sun salutations, one of my shoulders can't really handle them (damage from an accident several years back) and too many makes it downright hurt (yes, I've had my form checked, too). Unfortunately, power yoga and flow-type yogas are my absolute favorite so I have to figure out how to do it without bothering my shoulder because I just can't see myself eliminating them...maybe just doing them a little less often.
ETA: I do have Jill Miller's Shoulder Shape-Up but haven't even viewed it yet