I have suffered from tinnitus for many years. I find it only really a problem when there is little background noise - this is mainly a problem at night.
I find it really helps to have a radio/CD on at night and I have tried (on advice) putting a small speaker under the pillow as it usually the dependent (lower) ear that is worse due to being muffled on the pillow.
I would also say to continue to avoid loud noises and use ear protection where possible. I think I have very sensitive ears as even a door slam or hammering nails can make my tinnitus worse.
There is no cure so best of luck in managing it.