Recall we are not defending any watered down version of bod which we do agree is a grave problem. We are defending the position that (1) implicit desire is sufficient for individuals who've not heard the Church ...
You never cease to amaze me. This is about the third or fourth time you've contradicted yourself from one sentence to the next.
What you list in "(1)" IS a "watered down version of BoD" ... and you are defending it.
This notion that non-Catholics can be saved by some implicit desire destroys the Tridentine (and St. Robert Bellarmine's) ecclesiology of Church as visible society, and is nothing less that Prot and Conciliar ecclesiology (which you condemn as heretical despite holding it yourself). St. Robert Bellarmine limited BoD to catechumens. THAT is the "not watered down" version of BoD.
And, how many versions of BoD are there, eh? I thought the Church has defined it. See, we don't believe in "concepts" or "words", but in propositions. Given that we have many versions of BoD, it's clear evidence that the Church has not defined anything for belief, since then every proponent of BoD would believe the same things about it.
In point of fact, the common factor in all "versions" of BoD reduces to "the Sacrament of Baptism is not necessary for salvation", in other words, to a heresy. Your "BoD" doctrine is nothing more than your (bad-willed) way to gut EENS dogma so that you don't have to accept the proposition that only those visibly in the Church Church can be saved.
In doing so, however, you have absolutely no reason to reject Vatican II, since all its errors are in fact related to these ecclesiological consequences of non-Catholics being saved.
MAJOR: No Savlation Outside the Church [dogma]
MINOR: Non-Catholics can be saved.
CONCLUSION: Non-Catholics can be in the Church.
This very elementary syllogism exposes the contradiction of your nonsense and that of most (though not all) SVs who hold that V2 ecclesilogy is heretical or gravely erroneous. So this ecclesiology where the Church consists not only of Catholics (at its subsistent core), but also of various non-Catholics who approximate Catholicism to varying degrees, our separated brethren, brethren because they're actually in the Church (they have to be in order to be saved), even if the are materially separated in terms of what they actually believe and profess, and even if they're unaware of it themselves ... is actually nothing more than the logical consequence and profound expression of the same ecclesiology that you hold. V2 cited "Suprema Haec" as the source for this novel ecclesiology that SVs denounce as heretical ... while then claming that SH has quasi-dogmatic force when using it to attack Feeneyites.
These contradictions are the surest signs of bad will and ulterior motives, where you're not seeking (and finding) truth, but are motivated by these ulterior motivations to affirm contradictory propositions at the same time.