In a few minutes, if no one tells me to do otherwise, I'm going to erase the blockchain and force a reload, but this time with the wallet already in place. I'll remove everything from the data directory and insert the wallet.dat file. Then I'll find out tomorrow if it worked.

LET ME KNOW IF I SHOULD DO SOMETHING ELSE!