I disagree. Water and Spirit are clearly seen to be emphasis of Jesus in
John 3, and the emphasis in Acts is water baptism and Spirit baptism. I have believed for years that death burial and resurrection are in baptism.
Romans 6:3-4 Know ye not, that so many of us as were baptized into Jesus Christ were
baptized into his death? (4) Therefore we are
buried with him by baptism into death: that like as Christ was raised up from the dead by the glory of the Father, even so we also should walk in newness of life.
Colossians 2:11-12 In 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: (12) Buried 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.