Yeah, I'd rather governments drop the category religion entirely.
Apply the laws that are applicable regardless. If someone wants to do charitable work, they should qualify as any charity has to. If someone wants to be exempt from some requirement, all individuals in a similar situation should be exempt as well. Based on their feelings if necessary, but their feelings shouldn't be disregarded because, unlike someone who is catered to, they don't happen to associate them with an officially recognized ideological group.