No, it doesn't, I'm afraid. You have made the claim that we would have free will in the new creation, you also claim that evil will be erased in that same new creation. If that is the case, why does your god not erase evil now, leaving us free to do anything but evil? If that cannot be done because we would not have free will, then we will not have free will in the new creation. You cannot have it both ways.