If I were Pope, at the very outset, I would order that BoD and BoB are never to be mentioned by Catholics again, and that it be expunged from the works of theologians who opined in favor of it. Then I would pray and study about condemning it outright. I would at the very least declare that it was not revealed by Our Lord and due to the harm that the speculation causes (and that no good comes from it), the speculation is to be completely banned. BoD is pernicious speculation, as it has served no good purpose, and its fruits tell me everything I need to know about it. Its fruits have been gradual erosion and ultimately outright denial of EENS and ultimately religious indifferentism. If some Catechumen might be saved this way, then glory be to God, but talking about it serves no good purpose. As Father Feeney famously pointed out, this BoD theory only helps undermine the possibility that anyone might actually receive BoD, since people become complacent and less ardently desire Baptism, and are content to hope that the desire might save them. This dovetails with St. Gregory nαzιanzen's rejection of BoD, where he says that the desire for glory is not to be accounted as supplying for glory itself. So in desiring the desire for Baptism, you're no longer desiring Baptism.
Please explain the good that has come of BoD. In fact, if it were not for BoD, there could never have been a Vatican II ... which is why I believe God allowed it, since God willed to allow Vatican II. It was invented, as St. Augustine admitted, as a consolation to people who knew or were related to Catechumens who died without the Sacrament. But we don't invent doctrine for consolation purposes. It's similar to how the Modernists have invented that aborted babies could be saved or that people who commit ѕυιcιdє have good hope of salvation, etc. ... all to "console" people. Sure, if I tell someone that their relative who committed ѕυιcιdє is "in a better place now," as I heard one NO priest declare at the funeral of a ѕυιcιdє, it might bring some emotional comfort, but then what of the people who hear this and believe it if their lives become miserable? They might be inspired to go seek that "better place" themselves. Emotional Comfort is not the Church's primary mission.