You have no historical basis for that assertion. The "separation of church and state," as we know it, was discovered by the Warren Court in 1962. It is nowhere in the Constitution or any other founding document.
No. Jefferson used the phrase in a famous 1802 letter to describe the meaning and intent of the establishment clause. Madison was, if anything, an even stronger advocate of separation of church and state than was Jefferson.