I'd recommend waiting
a) The new updater will be out soon. The FE beta is supposed to be out in around two weeks, and the new client will be out before FE beta is out. It's coming really soon.
You're supposed to get a discount on FE for buying the original game. If you get WOM ultra-cheap, it may be cheaper to keep it.
c) One suggestion- try 4am to download from client-I-refuse-to-name, you can sometimes get it to work then.
d) Are you using an email to log in? That's required now I think.
Thankfully in two weeks Stardock fans won't have to worry about dealing with these problems. I don't blame Stardock for Gamestop's mismanagement, but it's still very disappointing because one of the best choices became the absolute worst.