I would consider Monitor Audio RX-6, PSB Image T6's or T5's. The Wharfedale 10 series considering the type of music you like, but speakers are very subjective. The PSB's are a very forgiving speaker of poorly recorded harsh sounding music. I imagine that the Wharfedales would be too. They tend to have a warmer, more laid back but detailed sound. I think that any of these would be better than the Energy's which are a decent speaker.