Any version of the conflict thesis that is seriously put forward will have to deal with this fact, that virtually every major historical advance in the field has shown itself problematic for the conflict thesis: this or that particular religious doctrine understood this or that particular way may conflict with this or that particular scientific conclusion at this or that particular stage of scientific inquiry, but the historical evidence that one proves to be a serious obstacle to the other has steadily grown weaker over time. The evidence suggests the rather weaker conclusion that people can force a conflict when they want to, and here and there can back themselves into corners they can't see a way out of, but that's the whole of the conflict. There is no monolith Religion opposed to a monolith Science, however much we may reify them.
I also want to point out one of the most pleasing mixed metaphors I've encountered: "...as if we had magically hit on the natural classification, and carved nature perfectly at the joints, our first time at bat". There's a sport for me--Butcherball.