The canon above is what you want to bring forward for BOD. The canon from Braga is the one I want to bring forward in contradiction of yours. Yours says catechumens are to be treated as Baptized, mine says they are not. Which one is correct? Also, who decides whether the catechumen's death was "through no fault of their own"?
From my perspective, this discussion is not about Baptism of Desire, but rather it is about the erroneous notion that the Church would promulgate teachings contrary to Herself. Specifically, I believe it is incorrect to interpret one Truth in a way that makes it contradict another. The proper orientation would be to show how each does not oppose the other. In this specific instance, the manner in which the Church treats a Catechumen who dies before receiving the Sacrament of Baptism, Canon Law would prevail as the Church's teaching on the topic. God, and God alone, would know the circuмstances of the Catechumen's demise.