I'm still not sure how God is going to save all Israel, but your model looks ok.
This is what keeps me thinking about the salvation of the Jews who believe in God, which is more than what can be said for the world who will not believe in God:
--John Gill Verse 26. "And so all Israel shall be saved,...." Meaning not the mystical spiritual Israel of God, consisting both of Jews and Gentiles, who shall appear to be saved in the Lord with an everlasting salvation, when all God's elect among the latter are gathered in, which is the sense many give into; but the people of the Jews, the generality of them, the body of that nation, called "the fulness" of them,
Romans 11:12, and relates to the latter day, when a nation of them shall be born again at once; when, their number being as the sand of the sea, they shall come up out of the lands where they are dispersed, and appoint them one head, Christ, and great shall be the day of Jezreel; when they as a body, even the far greater part of them that shall be in being, shall return and seek the Lord their God, and David their King; shall acknowledge Jesus to be the true Messiah, and shall look to him, believe on him, and be saved by him from wrath to come. There is a common saying among them {c}, abh Mlwel qlx Mhl vy larvy lk, "all Israel shall have a part," or "portion in the world to come"; and in support of this they usually produce the passage in
Isaiah 60:21: "thy people also shall be all righteous": yea, they even go so far as to say {d}, "that hell fire will have no power over the transgressors of Israel;" fancying, that every individual person of their nation will be saved; though they sometimes except such who deny the resurrection of the dead, and that the law is from heaven, or is an epicure, and he that reads foreign books, or is an enchanter, or pronounces the ineffable name: but the apostle is not to be understood with such a latitude; he refers to the last times, and to a very general conversion of them to the Messiah"
Albert Barnes: All Israel - All the Jews. It was a maxim among the Jews that “every Israelite should have part in the future age.” (Grotius.) The apostle applies that maxim to his own purpose; and declares the sense in which it would be true. He does not mean to say that every Jew of every age would be saved; for he had proved that a large portion of them would be, in his time, rejected and lost. But the time would come when, as a people, they would be recovered; when the nation would turn to God; and when it could be said of them that, as a nation, they were restored to the divine favor. It is not clear that he means that even then every individual of them would be saved, but the body of them; the great mass of the nation would be. Nor is it said when this would be. This is one of the things which “the Father hath put in his own power;” Acts 1:7. He has given us the assurance that it shall be done to encourage us in our efforts to save them; and he has concealed the time when it shall be, lest we should relax our efforts, or feel that no exertions were needed to accomplish what must take place at a fixed time."