whatever headphone you planning to upgrade to, as suggested by Akabane, a great AMP and DAC will bring difference to a same headphone. because you will never know how much potential ur headphone can go if you limiting it from DAC/AMP section.

btw, the HD600 is sounding nice with my audio-gd compass.