When I came to a more "apostolic" branch of Christianity from a more "evangelical" branch, my own baptism was somewhat suspect because there had been a separation of matter and form. (The words were said and then I was baptized, rather than them being said while I was baptized.) The bishop ended up saying it was okay.

I wonder if the CDF is being a little overzealous here. The sacraments (especially baptism) are hard to break if they are done with the proper intent. The Catholic Church has historically recognized other forms which seem further away than just "I" to "we". For instance, it recognized "the servant of God is baptized" and possibly even "may you be baptized" (see https://www.newadvent.org/cathen/02258b.htm#vi). In fact it seems to border almost on superstition to belabor this point and is somewhat scandalous. But I'm episcopal and not Catholic, and not a theologian, so I don't really have any authority in the matter.