Giuliani may have a point from the “establishment” point of view. We aren’t dealing with reality, we’re dealing with courts, who will almost certainly define the ban on muslim immigration as a roundabout “establishment.”
So, strategically, Trump should amend his criteria to temporarily ban immigration from specific countries. Lots of specific countries.
I hope that would include England, France and Germany.