Most people I know who have had upper back/shoulder/neck issues were able to get positive results from a chiropractor. Consider yourself lucky. I've had lower back spasms/tightness since I was in my early 20's and no one has been able to do ****
I don't believe in chiropractors. My wife went once and they fed her this bs line about a bunch of things wrong with her just to milk some more money. I would definitely do the massage thing though. They know so many tricks it's not even funny.