Watcha Tim
I suffered a great deal with shoulder pain through most of 2016 and ended up having a subacromial decompression on both sides last year. Basically shaving off bone to stop it pressing on squishy bits.
Prior to surgery, we'd tried steroid shots and physiotherapy, but this made no difference at all and I was Naproxen for most of the time (although one dose did seem to last me several days). Problem is, all of this took a good six months when surgery was the only thing that was going to work for me.
I ended up having keyhole in July and September (which looks a bit more invasive than what you'll need), with virtually no pain and really quick recuperation.
I know my problem was different and we all react to treatment differently, but I would say just get it sorted and if surgery's an option from the outset, get it done (IMO!).
Hope it all works out for you.
Ed