I think that he may have prepared some plan B as soon as he realized that his defeat would be due to him losing the body. There's Tengen too, we've no idea about what happened to her. And Sukuna's last words telling that he shouldn't be underestimated because he's a "curse"...