I have a couple more expensive headphones, for anything badly recorded , mastered/mixed I use the hd 6xx since they smooth everything over. I love piano recordings made by players in their rooms but thats a bad environment to record compared to a professional hall with too of the line mics and engineers or something. Those bad recordings get butchered by my stax, focal and totl akg setup.

Now, I have another solution for you if you feel the need to spend a bit and get something better. The Audeze LCD-2 has great bass with warm sound, way less critical than many headphones and an enjoyable listen. Just a bit of eq needed (the amount of eq needed is exaggerated by people, my stax setup needs more Eq, I can even share the eq profile with you if you get the lcd-2s). They should do well with your preferred Genres (Although I prefer other things for Acoustic (Grados) or classical (all my other headphones as thats what I listen to 90% of the time) but the LCD-2 does well enough).

Goodluck on your choice.