[Alligator]

I have some ATH-M50 head phones, which work well with my iPhone.  I am in the process of re-ripping everything I have into FLAC, and I'm looking for recommendations on a complete setup (audio player, amp, and new headphones).  The HD800's seem a little too expensive, but are close to the quality I'm looking for.  I'm seriously considering the Sony ZX1 when it comes out, paired with their PHA-2 amp.
 
Can I do better than this (around the same price range)?  If so, how?