There may be other things you can do - you could try a heating pad or an ice pack, or alternate the two. Find out which works better for this pain. Also, have you seen your doctor for this problem, and do you have a script for physical therapy?
For some people, a combination of ibuprofen & tylenol is helpful and would use LESS of each, than if you took one alone. If not, a prescription for percocet for SHORT TERM use until you can get some PT and get the problem under control.
One really good thing about a good PT treatment is that they will usually show you what you can do BEFORE the problem gets that bad. After the first time I had PT for my neck (severe cervical strain), I got the same kind of heat packs (moist heat / hydrocollator packs) that the PT people use. When my neck would start to bother me, I would heat it up in water (try to avoid boiling, it's not as effective because you want the water to be absorbed into the pack, not boiled out of it) and put it on for 20 minutes while I relaxed.
If COLD works better, make sure you have either a cold pack or two you can keep in the freezer, or buy a rubber ice bag (or both), or get an "instant cold pack" - but these are often only one-time use, and expensive, but might help if you're traveling.
Also, sometimes BIOFREEZE can give temporary relief. It's a menthol gel you can get from a PT or chiropractor, and maybe a drugstore or online. Or a massage therapist...
By the way, I had a chronic shoulder problem for a while, not as bad as you had, but a massage therapist who knew sports medicine would work on it, doing certain stretches, every 6-8 weeks, and over a period of time, the problem went away, and has not returned, even though (sadly) my massage therapist is now disabled from a bad knee and can't do her job. It's been almost 2 years since I've seen her.
In short - it's not even to pop pills even if they're anti-inflammatory. I was given a lot of ibuprofen (once was told to take 4x200mg a day - I simply couldn't stomach that amount. 2 bouts of tendinitis and a foot problem led to my stomach being wrecked by ibuprofen. Then for years I took Celebrex, a cox-2 inhibitor antiinflammatory. Eventually even that bothered my stomach and I had to (voluntarily) stop taking it several months ago because it caused stomach pain. Be careful!
For those wanting herbal treatment, Yucca AR helps some people - available in a health food store or online. It's not immediate, it works over a couple of weeks as its effect builds up.