You might try to do what I did. I was in the similar situation. I saved current walled.dat somewhere else.
I installed new wallet version, waited until block was synced, closed wallet and I copied back old walled.dat

After I launched wallet again it was synced and all coins were there.