MX-980, MX-810 or waiting HarmonyOne RF?

[tiger_qc]

hey I just bought the harmony 890 RF and I don't like it. I don't know it's just the shape, the keys location and it stop charging for no reason. I'm going to return it. I'm now lookin toward MX-980 or MX-810. I need a remote that would be use with;
tv: sharp lc52d82u
receiver: yamaha htr 6060
cable box: hdpvr explorer 8300
hd-dvd: toshiba hd-a30
blu-ray player/gaming: ps3 80go with nyko bluwave IR remote
dvd-r upscaler: samsung r160
cd player: sony ce215
dvd player: toshiba sd-430v
home automation: 14 x10 modules with IR-543 controller
I want to set macros involving specific x10 modules in some activities. so MX-980, MX-810 or do I wait for the replacement model of harmony 890 RF ¨harmony two¨ or wathever they will call it. (RF version of the harmony one)
My home theater's almost complete the only thing missing now is a decent remote that will replace my piece of crap one for all remote and nextgeneration ovni shape RF transmitter. (I'm not keeping the harmony 890 it's allready back in it's box)
anyone can help me ?