There is one flock, one Shepherd (The Mediator), not two
John 10:16 (New International Version)
16 I have other sheep that are not of this sheep pen. I must bring them also. They too will listen to my voice, and there shall be one flock and one shepherd.
There is one vine, not two
John 15:5 (New International Version)
5 "I am the vine; you are the branches. If a man remains in me and I in him, he will bear much fruit; apart from me you can do nothing.
As it is, we are "grafted in" to the original vine of God's people (the Jews) Romans 11, not the other way round.
There is one city where God will live with men (the New Jerusalem/the Holy Hill/Mount Zion/City of David) not two
Joel 2:32 (New International Version)
32 And everyone who calls
on the name of the LORD will be saved;
for on Mount Zion and in Jerusalem
there will be deliverance,
as the LORD has said,
among the survivors
whom the LORD calls.
Hebrews 12:22 (New International Version)
22 But you have come to Mount Zion, to the heavenly Jerusalem, the city of the living God. You have come to thousands upon thousands of angels in joyful assembly
Revelation 21:2-3 (New International Version)
2 I saw the Holy City, the new Jerusalem, coming down out of heaven from God, prepared as a bride beautifully dressed for her husband. 3 And I heard a loud voice from the throne saying, "Now the dwelling of God is with men, and he will live with them. They will be his people, and God himself will be with them and be their God.
All the best,
Stephen