Perfect Cheap Library Setup?

[musedesign]

Hi All, I go to the library almost everyday. Love listening to internet radio will working.  Currently:
 
Headphones:
Sennheiser HD 201
 
DAC:
Nuforce Icon uDAC-2
 
Sources:
iphone 3G 16G
MacBook Pro 15", Intel 2.2GHz
 
I have ordered a pair of MEE M6 in Black thinking they will offer better noise isolation. 
 
Macbook Pro - Itunes - Nuforce uDAC - Sennheiser HD 201 is the current setup.  Was wondering if I could get better sound from the iphone and a iBasso D2 Boa, then from the MacBook and the uDAC?  Any other suggestions?  Thanks!

 

[81309]

Theres not really a reason for running an amp for the M6, they are quite easy drivable, i would rather upgrade the headphones or Mp3 even more, i think(correct me if im wrong that you can get the SM3's for the price of ibasso d2 + m6, and the sm3's... dear god they are sweet, and my cowon j3 is driving them very well, the ipod/iphones should be availiable to aswell