OK, Thanks very much, I did delete everything but wallet.dat and restarted, and it seems to be working so far (busily trying to synch).
Here's my question now: before it was saying (when I look at "About Bitcoin-Qt") that it was version 0.3.something or other.
Now that I deleted everything and restarted, About is saying its 0.8.1
I thought it (from an answer somewhere else) that Bitcoin-Qt wouldn't do an auto-update?
Is this normal?
You must be mistaken. There was never a version 0.3.666 of Bitcoin-Qt (the latest version 0.3.x was 0.3.24) and versions prior to 0.4.0 did not support encryption. If your wallet was encrypted, you were definitely not using version 0.3.something. Bitcoin-Qt certainly does not auto-update; you were most likely using 0.8.1 all along and got confused about the version number somehow.