About the .tpl files. I spent a great deal of time modifying to my needs.Changing the wording etc.Have the .tpl's changed a good deal or can I upload and overwrite the ones from this upgrade?
Changed templates, check if you modified any of them, if yes, compare the one from upgrade with the one you are using. You can use software like WinMerge to compare the templates.