Ping to a very interesting discussion. I don't know if you are following this, but I would be very interested in your thoughts. I've been wrestling with this myself for several years, and am glad to see some heavyweights tackling this issue.
I have been quite involved with another gentleman, so I haven't been deeply following the issue. I do know, though, that the Church tells us that God is NOT bound by the Sacraments, thus, Baptism is not absolutely required for salvation. Thus, Justin the Martyr could say that Socrates was a "Christian", which is also in-line with Paul and Romans regarding the "law written on their {pagans} hearts" who are circumcised spiritually. I am a bit confused how St. Augustine, fighting the Donatists, could propose the above, but then propose mass damnatia of infants because they had not been baptised...
Mercy over justice, says James...
Brother in Christ