I spent well over ten years developing and upgrading my headphone system to where it is now. There were many learning moments along the way for me (you can see my primary headphone system by clicking on my ID). A couple things, although headphone systems are very personal.
Be really carefull of overly detailed electronics. The headphones are right in your ear… high frequency noice and distortion go right into them. If your system is fatiguing, even in a small way, this is your problem. Over time I moved to all tube headphone amps after too many fatiguing solid state amps. Many headphones need lots of power… I chose Woo for my amps… I have used three for thousands of hours.
Look for high quality natural sounding DAC and streamer. A PC can work… but at some point in improving sound a dedicated streamer is necessary to get really great sound. They are built from the ground up to be quiet and high fidelity. Yes, they matter. It may not be intuitive, but they can make a big difference with appropriate other components.