One step forward...
Shoulder seems to be behaving at last. Curry last night was too hot, and is still hurting, though...
After some poking and prodding the doctor thought that the shoulder and neck pain was probably referred pain from further down the back, which makes a certain amount of sense to me. Rest, hot baths, ibuprofen, go back if it's not better in a week.
The bottom cm or so of my magazine is now damp from where I kept nearly dropping off in the bath while trying to read it l-)