In my experience with both shots in the shoulder and quick-fix options, I would have done the same. I got an MRI with contrast where they had to inject contrast ink into my glenoid. It was uncomfortable to say the least. On top of that, if it's just inflammation, the NSAID will take care of it soon. Cortisone shots can be really helpful, but seems unnecessary in your situation. Just be patient, ice it whenever you feel any aching, and keep it light in the upper body for a week. See how it goes from there.
Oh, I also wanted to mention that I did my first split similar to your's today. I practiced my power clean (not ready for the full squat clean quite yet) with a 3x5, then did today's CFFB workout with 1x BW and burpees instead of pullups since my gym has no pullup bar with grip. The grips will tear my skin in a lil over 20 pullups every time. I liked it though. I got stuff done, got my ass kicked, and also got to work on my L-sit. We'll see how it goes, but we both know it's gonna improve my general fitness quite a bit. Thanks for the idea