Naproxen Sodium (Aleve). It's a miracle drug for me for inflammation.

Good luck on the MRI - I hope it doesn't result in their rebuilding your shoulder - I hope it's just you need some PT and rest...