So the Linux box version is working fine? Have you got the full blockchain there? If so, you c I uld try backing up your current data folder, replace it with the Linux box version and try again (with your same wallet dat) and try rescanning it to see if that'll work.
Yes, I have the full blockchain on the linux box, and also rsynced to the Mac, so it's in both places. Both the bitcoind running on the linux box and the Mac bitcoin-core client have no problem with the blockchain when starting with an empty wallet (I just delete the wallet.dat file and restart jye client), so in principle, as far as I know, the blockchain should be ok.
But when I start the client on the Mac with my old wallet.dat file, it rescans the blockchain starting from block 470713 and fails before reaching the current height.
This never happened before, with the same exact setup and wallet.dat file. The only thing I can think of is that the blockchain got somehow corrupted, but I don't understand why neither client seems to notice with an empty wallet. Also, I don't know how to fix it. Downloading the whole thing from scratch is only a desperate last resort option given how long it takes. There must be a better option.