hi
i suggest you to check the segmental mobility of spine seperately,i mean upper ,middle and lower.
try myofascial release-especially suboccipital release
ice and stretch to trapezius
ischaemic compression in trapezius
relaxation exercise
ergonomic advice