BUR #17566 has been approved by @nonamethanks.
From how they're used they're pretty much synonyms, and nowadays choir is also used outside of church context.
Btw, should this also include choir clothing, or we give it another tag? (namely that w-shaped collar thing, choir collar?)