I think I have decided what to go for. My current system still impresses me, by which I mean to say that I'm a bit scared to buy the Edirols or something of the like and that they will disappoint me.
It's a bit 'overdone' if I buy a set of speakers with a built in DAC, when there's also the option of buying a desktop DAC (like the already mentioned NuForce Icon uDAC-2). This amp will not only power my headphones to the next level, but also be the right DAC for my current speaker set up.
It leaves me the option for when the day comes that I want a new speaker system. I can connect about anything I want to the uDAC-2 via it's RCA out connections.
I'm still in a doubt of what to buy for my portable wishes. I could get the FiiO E7 or NuForce Icon Mobile, and use those as my desktop DAC too. The problem is I don't like the fact that they're battery powered, where the udac-2 is not (but is not portable).
Then again, I could buy the udac-2 for home use and (when it comes out, or is it already?) the FiiO E11 for my portable amping. Any thoughts on these amps? Other options?