A brief history of pain:
So a few months ago, bad form on ring dips and overworking myself in capoeira led me to a decrease in ability to contract. I just felt weaker, not necessarily pain. Over time, as I refused to listen to the warning signals, inconvenience led way to pain. I tried minor rest, but never with any real dedication, and anybody who knows capoeira knows that it's impossible to really isolate the arms (of course, I tried to pretend that I would manage). Weeks turned to months, and at some point I began integrating a shoulder rehab routine I had been prescribed for my other shoulder with slight modification. I became so excited with this routine, that I turned it into a shoulder destroyed itself. It went something like this: 2 sets of Ido's shoulder ROM, 2 sets of his scapula routine, 3 sets of (sidelying external rotation - 10, pushups - 10, limited ROM/assisted dips - 10). No rest and daily. I supplemented this with self-myofascial release work (lacrosse ball to the teres minor, infraspinatus, supraspinatus). The SMR made a huge difference in the pain, but I woke up Monday with an intractable pain. No doubt in my mind it was caused by an overly aggressive rehab routine.
So yesterday I went with my friend to a gym he works at (he's a personal trainer) to show him Ido's explosive leg workout routine (my hamstrings are fried right now). Someone at the gym with his education in massage therapy took a look at my shoulder, finding various trigger points, holding them while I breath. He went from supraspinatus, teres minor, infraspinatus, to the pec minor, and subscapularis. Going through these spots, he said that there were several trigger points causing my difficulties. He said an injury to the tissue would be more debilitating than a trigger point.
So, after all that, here's my question: How can I differentiate between a trigger point and an injury? How should I approach them as separate entities? I want to believe I can just press my trigger points away and start dipping right away, but I doubt that anything in life would be so convenient. I'm not sure what to make of all this. I'm not even sure if my questions make sense in the way of having answers. Furthermore regarding the nature of an injury, what I keep reading is if it doesn't hurt, it's okay to do (I'm assuming this assumes that good form is maintained). Should I feel safe holding handstands, for example, if they cause me no pain. I'm open to any recommendations of literature that might enhance my comprehension of this matter (I'm currently waiting for Anatomy Trains).
Many thanks, and apologies for the thick introduction.