Like I said, Peter is not talking about water baptism. He is talking about our baptism into Christ through participating with Him in His death and resurrection. You are projecting your own beliefs into what he is saying. Same goes for your view of Romans 6. So no, just because he uses the word "baptism" does not mean he was talking about water baptism.
Was Jesus speaking of water baptism when He said, "But I have a baptism to be baptized with, and how distressed I am till it is accomplished!" (Lk 12:50)? No. He was speaking of bearing our sins that would make Him one with sin... the death part of His death and resurrection.
Was John the Baptist speaking of water baptism when he said, "He who is coming after me is mightier than I, whose sandals I am not worthy to carry. He will baptize you with the Holy Spirit and fire." (Mt 3:11)? No. He was contrasting water baptism and the Holy Spirit's baptism.
Was Paul speaking of water baptism when he said, "Moreover, brethren, I do not want you to be unaware that all our fathers were under the cloud, all passed through the sea, all were baptized into Moses in the cloud and in the sea, all ate the same spiritual food, and all drank the same spiritual drink." (1 Co 10:1–4)? No. He was talking about cloud and sea baptism.
Was Paul speaking of water baptism when he said, "For by one Spirit we were all baptized into one body—whether Jews or Greeks, whether slaves or free—and have all been made to drink into one Spirit. (1 Co 12:13)? No. He was talking about the Holy Spirit's baptism.
Was Paul speaking of water baptism when he said, "For you are all sons of God through faith in Christ Jesus. For as many of you as were baptized into Christ have put on Christ. (Ga 3:26–27)? No. He was talking about the Spirit of God coming to live in our hearts, making us first generation offspring of the living God through the Holy Spirit's baptism.
So no, you have not made the case that Peter (in 1 Peter) or Paul (in Romans 6) were taling about water baptism.