I don't think massages will provide more than temporary relief. If the cause of the muscle tension is not resolved, it will come back. Reducing the muslce tension may allow the vertebra to self correct but that is usually a very slow process, if it happens.

The voltaren may help since it is anti-inflammatory. Can you get the enteric tablets? Topical gel may not give you the deep benefit you need. Paracetamol is only pain relief, not anti-inflammatory.

The chronic headaches from NSAIDS concept is a possibility but not the rule. I think it is worth the risk. As I said, I have been on NSAIDS for almost 3 decades. I had a problem with headaches for 6 months after hitting my head with a dropped transmission. My neuro tried a number of meds and suggested high dose aspirin and acetaminophen/paracetamol combined. It worked great.