Finally got it working.  The -salvage... did not work.  I had to do dumpprivkey / importprivkey method and had to sync old wallet first to avoid -2 error.
Lost 10K coins in the process but it's not the first time.  Cost of doing business.

Problem now is the wallet not syncing up till 7 hours ago.  I'll give up soon-ish.  

Hopefully my exchange has better luck...