I would switch to the dumbbells myself because if the barbell is giving you shoulder pain then that is a red flag. Whenever somebody trains a muscle, they need to concentrate on working that muscle intensely as well as maintaining proper form. When you are in pain or even discomfort, you can't concentrate as well on the muscle as if you weren't. And if you try to ignore the pain. it just might lead to a serious injury!
On the over hand, I prefer dumbbells because you get a better range of motion with them and also, since they work independently, you can not cheat the weight up if one side is a little stronger than the other. As a result, even though you might be able to do more weight with the barbell, you will get better muscular development with the dumbbells.
------------------
If you build it they will come