I agree with what you say here about how V-II changed the church's message.  As is see it, that was essentially the end of Catholicism, replacing the Catholic message of salvation with a message common to most Protestant sects.   Given the hundreds of Protestant sects out there already (many failing miserably), I can't imagine what kind of model would emerge that could be considered "Catholic."