I currently have a X10 light switch, however it shuts itself off very often due to noise on the line. I'm looking to replace it with something that doesn't send the on/off signal via the electric lines - hence moving to Z-Wave (feel free to make recommendations).

In the process - I'm thinking of getting a Harmony Smart Control to also control (all my equip is in a equip room away from the home theater room)- does this also control the z-wave switches without need of any additional add -ons?
Also what's the diff between the Harmony Smart Control and the too be released Harmony Ultimate Hub?
Also feel free to advise/recommend other products if you feel it'll accomplish what I need

thx