x2. I've found that upgrading sources most consistently produced improvements, and took my gear up to a higher level. Whereas, with amps and headphones, you can more often go sideways and get something merely different rather than better. Once you have decent headphones and amps, make sure you get a solid high-end source. There are different schools of thought ofcourse, but this is my opinion and from my experience.