If you do end up doing another factory reset, make sure you remove your Google account from the Settings>Accounts menu first. With Factory Reset Protection, if you don't remove the existing primary account, the phone will default to that account when asking for a Google password after the phone restarts.