Yes change your music line up. Songs that get you thinking about the ex are the worst. The best songs are the ones that pump you up and have lyrics that make you take them off the pedestal.
So Happy --Theory of a Deadman
Beautiful -- 10 Years (this one sound deceiving, but you have to listen to the words)
Runnin' Wild -- Airborne (one of my favs very AC/DC like)
Stay away from country... I've been incorporating more country music in to my music portfolio. I'm very selective though... a lot of songs that are out get me thinking. That's why I stick more toward the heavy rock.