Consider the Fischer FA-003. Really though the Shure 840 is a great headphone for the price and great for home usage. Both should do the job well. The E07k can amp both no worries.
You can get the Fischer FA-003 cheaper by buying the Brainwavs HM5, which is the exact same headphone but a cheaper rebranding.
Thanks, I'll have a look at both headphones, but will they sound good even without an amp? This was one of my concerns and so was why I choose the M50's. My E07K is currently attached to my gaming laptop and is connected to my Razer Tiamat 2.2 and Creative speakers for added bass. It would be a pain to connect and reconnect every time I wanted to listen to music. Would the FiiO E6 be able to amp sufficiently? Thanks.