Now for the rest of your post.
Jesus said that circumcision is the same as baptism
Where does Jesus say this?
but when we are baptised we are circumcised to the heart of Christ. THis is done by the Holy Spirit.
Col.2
8Beware lest any man spoil you through philosophy and vain deceit, after the tradition of men, after the rudiments of the world, and not after Christ.
9For in him dwelleth all the fulness of the Godhead bodily.
10And ye are complete in him, which is the head of all principality and power:
11In whom also ye are circumcised with the circumcision made without hands, in putting off the body of the sins of the flesh by the
circumcision of Christ:
12Buried with him in baptism, wherein also ye are risen with him through the faith of the operation of God, who hath raised him from the dead.
13And you, being dead in your sins and the uncircumcision of your flesh, hath he quickened together with him, having forgiven you all trespasses;
I think we need to ask ourselves what is meant by the “circumcision of Christ”. It is probably safe to say that the circumcision of Christ" would be the same as the circumcision of the heart. This circumcision of Christ is our choice “in putting off the body of the sins of the flesh”. This of coarse can only be accomplished through the indwelling of God’s Spirit.
Romans 2:29
But he is a Jew, which is one inwardly; and circumcision is that of the heart, in the spirit, and not in the letter; whose praise is not of men, but of God.
And we have to realise that this is not exclusively a NT concept.
Consider this Deu.30
1And it shall come to pass, when all these things are come upon thee, the blessing and the curse, which I have set before thee, and thou shalt call them to mind among all the nations, whither the LORD thy God hath driven thee,
2And shalt return unto the LORD thy God, and shalt obey his voice according to all that I command thee this day, thou and thy children, with all thine heart, and with all thy soul;
3That then the LORD thy God will turn thy captivity, and have compassion upon thee, and will return and gather thee from all the nations, whither the LORD thy God hath scattered thee.
4If any of thine be driven out unto the outmost parts of heaven, from thence will the LORD thy God gather thee, and from thence will he fetch thee:
5And the LORD thy God will bring thee into the land which thy fathers possessed, and thou shalt possess it; and he will do thee good, and multiply thee above thy fathers.
6And the LORD thy God will circumcise thine heart, and the heart of thy seed, to love the LORD thy God with all thine heart, and with all thy soul, that thou mayest live.
Notice that all these blessings of the Lord including the circumcision of the heart come about if and only if they “shalt return unto the LORD thy God” This is of coarse a choice. It is a matter of FAITH even in the OT.
Now, compare this to Gen. 17
10This is my covenant, which ye shall keep, between me and you and thy seed after thee; Every man child among you shall be circumcised.
11And ye shall circumcise the flesh of your foreskin; and it shall be a token of the covenant betwixt me and you.
12And he that is eight days old shall be circumcised among you, every man child in your generations, he that is born in the house, or bought with money of any stranger, which is not of thy seed.
13He that is born in thy house, and he that is bought with thy money, must needs be circumcised: and my covenant shall be in your flesh for an everlasting covenant.
14And the uncircumcised man child whose flesh of his foreskin is not circumcised, that soul shall be cut off from his people; he hath broken my covenant.
This is not a choice. It is a commandment of God. So altho baptism and circumcision are similar in that they both identify us as God’s chosen people. The circumcision done with hands in the flesh is a command by God to show that it is from this people that God will impliment His plan of salvation. And that of coarse is manifest in the person of Jesus Christ. The circimcision done without hands, circumcision of Christ, of the heart is our choice through the power of the Holy Spirit and as Col2 points out is done before baptism which is the announcement to the world of our circumcision in Christ “in putting off the body of the sins of the flesh”