You, I fear, will insist on only one. Oh well, peace be with you. I pray now that you and I will find the light that we both seek and that we will embrace the truth. He was saved from the water, i.e. drowning. I beg you to see that the issue is not Noah but rather baptism.
Baptism IS an essential part of the salvation equation under ordinary circumstances.
To teach otherwise is a fatal herasy. To teach otherwise contradicts the teaching of the Church for the last 2000 years.