I think a) seems very quixotic and causes more problems than it solves.
Instead, I would say that discrimination should probably only be illegal in places where there aren’t enough of the thing (jobs, etc). For example, what about x-only clubs, or ladies’ nights or gyms or etc.