I know you said you don’t want to start clean, but at this point, the only way to ensure a fully clean system state is to do a full flash using SPFlash, as this process isn’t the same as resetting the phone from within Android or resetting the phone from the fastboot/recovery menu.
Further, I’d recommend at least testing the device without restoring your Android profile backup at login, to rule out any potential issues from restoring the profile data.