Now i'm having a lot of trouble deciding what the next upgrade will be T_T ....from a fiio e10 i'm supposing getting a good amp would be the way to go, but there's also the possibility of going for an amp/DAC as well.
well, a few possible choices:
the O2 NwAvGuy
the CmoyBB
Meier Corda 2move
C&C XO2
.....well, honestly, i'm out of good ideas
I'm also looking for an amp and have read a lot about portable ones. The ones you've chosen are all notable but if I may add, the TTVJ Slim w/ USB DAC may be of great use for you. I remember you told me you like your vocals in your songs and the TTVJ slim is a warm sounding slim amp which can also have a USB DAC. It should be a big upgrade from the fiio e10 in both DAC and AMP functions. It also keeps your laptop rig very portable.
If you've already considered the CmoyBB, you might also want to look at the JDS Labs c421 which uses the same Opamps their CmoyBB uses specifically AD8620 or OPA2227. In reviews, it is said to be an upgraded version of the Cmoy with USB charging and a slimmer, more solid enclosure. It should have more battery life and stronger driving power than the Cmoy (as JDS Labs stated). The OPA2227 seems like the warmer choice based on what I've read between the two opamp choices.
Of course, researching is good but auditioning will be better. Can't wait for my pair to show up at my doorstep.

EDIT:
Of course, what I said above is based on what I've read about the HD600 and portable amps paired with it. Also from what I remember your preferences are.