Definitely go with Option A so we can get rid of the old wallets asap...

Same as Kazadar I had one of my 1.2.1 wallets fork again yesterday which just finished re-syncing a few hours ago.

As soon as the source is made public I'll be ready to compile and deploy asap as well...