That is correct,  long term, if you value the coins in your wallet, then moving to an Armory wallet is essential.   

Anyway, these folks have got a lot of V.C. funding.  So I expect a lot of improvement in their code.

This will be part of the plan.

Short term however is working with a plan that is more like 'mastercoin'.  Please stay tuned.