I am baptised (shortly before NO + conditional), and we got perfect contrition and spiritual communion.
And yes, I prefer to follow the example of St. Hermenegild.
Obviously you are. I should have been more clear, that I had in mind a theoretical case, where a person would not have yet been baptized, desired to be, but had no one except a heretic to baptize him.
The constant teaching of the Church, for many centuries now, if I'm not mistaken, is that anyone --- even an atheist --- can baptize in an emergency.