I have had tinnitus from an infection, which (very thankfully, and I admit very luckily) slowly resolved over a period of years.

That said, I have experienced occasional reoccurrence. One thing that helps is I ask my masseuse to concentrate on the sides of my neck- there is a specific muscle that when tense can cause ringing.

Does your tinnitus get momentarily worse when you tense your neck muscles?