I couldn't follow the last part of the rename procedure havigng to do with keychain, I never have been able to understand the format of that window. I hope that isn't a hole I will fall in later on.
but as far as getting my files in a working Home: folder, your links pretty much covered what...