So I finally have both machines running with clean installs that are fully activated, and in the process of loading programs, games and other software etc.
I have found though that suddenly I have 2 logins showing up on the login page which is preventing the auto login from happening which, I am now trying to figure out how to resolve as in the user accounts section there is only my main live account showing up, and everywhere I look there is only one user which is my live account, but the login page is showing a local account as well.
That is on both pc's and I am wondering if it has something to do with me changing the computer names so they are not "PC-XXXXXXX" and instead, are labelled correctly as "Gaming" & "Media", if that is what has caused it then it's yet another PITA issue to fix.
***Update***
Well I finally figured out the reason for the 2 user logins appearing, and it was because I was telling it that I didn't want to enter the password and instead wanted to boot, directly in to the desktop without asking for a password.
As soon as I changed it back so it asked me for a password or pin, the 2nd user account disappeared.