Thus, water baptism is necessary for salvation. BOD just provides grace/justification.
Yes, and the key difference is the following:
Water Baptism = The Sacrament of Baptism = Salvation (when one perseveres in state of justification until death)
vs.
BOD = extra-Sacramental repentance/cleansing = Justification (when one perseveres in that state until death)
The Sacrament of Baptism provides forgiveness of ALL past sins AS WELL AS the remission of ALL TEMPORAL PUNISHMENT for those sins.
BOD provides forgiveness of all past sins, but DOES NOT provide remission of temporal punishment for those sins.
So, a person receiving the Sacrament of Baptism and not committing another sin before his death, goes straight to Heaven. A person "receiving" BOD and not committing another sin before his death, goes, at best, to Purgatory because he still has to pay off his debt for his sins committed prior to "receiving" BOD. Both people, ultimately, make it to Heaven. But one just takes the detour to Purgatory first.
Therefore, "salvation" means complete avoidance of any kind of Purgatory (salvation from the fires of Hell). It is
only possible for a Catholic with the assistance of the Sacraments to have
the hope that they can avoid Purgatory.
Justification means the state of righteousness (potentially just momentary) that, if persevered in until death, will be good enough to get a person at least into Purgatory but never straight to Heaven.
An unjustified person goes to Hell.
Said another way:
Saved (Sacramentally-cleansed, state of grace, and no temporal debt) = Heaven-bound
Merely Justified (state of grace but temporal debt still remaining) = Purgatory-bound
Unjustified (state of mortal sin) = Hell-bound