I have found that music with loud beats or 'chunky' guitar parts aggravate my tinnitus to the point of my musical tastes having changed: I listen to a lot of what could be called 'new age' or 'ambient', mostly in headphones, at low volumes. Steve Roach, Ishq, Alio Die, Robert Rich, Heavenchord...