And here is your fatal flaw, one among many I suppose. God has promised, made an oath if you will, to save men through baptism. Now if God ended up by not saving men through baptism by withdrawing His saving powers from it then you could say that God broke His promise. But if God chooses to supply the effects for baptism by another means, that doesn't amount to breaking His promise, for He can save a man in any way He desires without being prejudicial to His own sacraments by temporarily extending the power of one in certain cases of necessity.
But revelation has taught that baptism is absolutely necessary for salvation and that is what we should teach without reserve, for even though sometimes a desire for baptism, among other things, can justify, it is not in any way equal to or beside sacramental baptism.