Well Fi Id go for the H340. It does everything that you currently need. So, there is a question mark over the future release of firmware but I wouldn't buy any system on promises of future support. I want what I buy to do what I want when I buy it.
Go on, you know you want it.
And if you don't like it, then just send it back again.
Or, goto
www.advancedmp3players.co.uk - they have a search feature where you plug in your requirements and it gives you a list of suitable machines.