Better S

[388043]

This is a weird hybrid type question but bear with it.
 
My audio system at the moment is Asus Xonar Essence STX > Sennheiser HD558s
                                                                                     > Cambridge Audio AM1 > Wharfedale 10.1s
 
I thinking of getting rid of the Xonar and having > Cambridge Audio DACmagic 100 (Or Schiit Modi) > Schiit Magni > Sennheiser HD558s
                                                                                                                                                     > Cambridge Audio AM1 > Wharfedale 10.1s
 
Or the other option would be > Cambridge Audio DACmagic (or Schiit Modi) > Cambridge Audio AM10 > Sennheiser HD558s
                        > Wharfedale 10.1
 
My question really would be do I buy I dedicated headphone amp to go along with the DAC or do I upgrade my current amp to one with a headphone jack? I'm quite set on the CA equipment but If someone has a better suggestion I'm open.
 
(The setup)