I would agree with you, provided one condition exists. Define "Religion" by Federal Statute (e.g. All Russian Spetnaz Units cannot declare themselves a "religion.")
I know of at least one religion in which its violent military and unrestrained nature overwhelms whatever spiritual value it may have.
So you would protect the Free Exercise Clause by abolishing the No Establishment of Religion Clause?