Hi ,
my neck also stiffed from last year and i faced lot problem, but i use to sleep on my back i don't remember when last time i sleep on my shoulders,
But i use to take Memory foam pillow , its not enough for me cause i need to get memory mattress to support my back also.
i prefer you to try Memory foam hope it will work and try to take some heat pad if u still feel pain.
wish you good health .