I actually like the law just the way it is. It's a good balance. If you want to have a business, make it available to all "protected classes." If you want to discriminate, form your own private club, school, etc.
We don't have ultimate freedom to do whatever we want, without consequences. Pretty much every right we have is conditional.