OP, if everything has been resolved (including the encryption of the wallet file), please lock this topic.
You can lock it by scrolling down and clicking 'lock topic' at the bottom left corner of this page.
Yes, I've updated the password and encrypted the wallet.
Again, thank you to everyone for all the help and advice!
I will now lock the topic.