It is about the music, do not let gears come between you and music. Today I spend the entire day with the good old ipod 5G, honestly I have not had such an enjoyable musical session in a long while.
The setup you have is more than fine, head-fi is mostly about addiction to gear than music itself.
I wish I have more than ipods to shoot....
Warning: Spoiler! (Click to show)