I agree, the Church is a type of spiritual Israel, and a true Jew believes in the Messiah Jesus. But in the Heavenly city we have the 12 tribes and 12 apostles. And Israel was first and because of unbelief they were broken off and punished for rejecting the Messiah, but will be grafted back into their natural tree and partake of the root (which is Christ).
But the remnant now (in this age) are Messianic Jews. When Jesus comes back, a larger remnant will be saved-the whole nation that is left at one time.
Zech 12,
6“On that day I will make the clans of Judah like a flame that sets a woodpile ablaze or like a burning torch among sheaves of grain. They will burn up all the neighboring nations right and left, while the people living in Jerusalem remain secure.
7“The LORD will give victory to the rest of Judah first, before Jerusalem, so that the people of Jerusalem and the royal line of David will not have greater honor than the rest of Judah.
8On that day the LORD will defend the people of Jerusalem; the weakest among them will be as mighty as King David! And the royal descendants will be like God, like the angel of the LORD who goes before them!
9For on that day I will begin to destroy all the nations that come against Jerusalem.
10“Then I will pour out a spirit
b of grace and prayer on the family of David and on the people of Jerusalem. They will look on me whom they have pierced and mourn for him as for an only son. They will grieve bitterly for him as for a firstborn son who has died.
11The sorrow and mourning in Jerusalem on that day will be like the great mourning for Hadad-rimmon in the valley of Megiddo.
12“All Israel will mourn, each clan by itself, and with the husbands separate from their wives. The clan of David will mourn alone, as will the clan of Nathan,
13the clan of Levi, and the clan of Shimei.
14Each of the surviving clans from Judah will mourn separately, and with the husbands separate from their wives.