I'm in the same boat.
iOS = iPod + Solo + amp / iPod + HP-P1 (+ amp if you're really keen)
Android = DX100 / DX100 + amp if you're really keen
Nokia N8 + USB amp/DAC (see Anilaxus's set up)
I think the things to consider are:
1) price (including interconnects)
3) pocketability/portability/intended usage
For me, the DX100 is back in contention as my no1 because it's a single device and can be pocketed - my main use would be commuting and I'd prefer something I can pocket and not worry about interconnects getting pulled about or having to charge multiple devices. It can do 128GB of storage which would fit all my music in high bit-rate lossy or a decent chunk in lossless, and the latest firmware seems to have got it to the point where it's easy enough to use. I'm a Mac user but not religious about everything being tied into the iOS ecosystem.
Your primary use might be different so you might be okay with a stack w/interconnects.