Your solution attempts to side step the issue rather than confronting it. In an effort to side step, you merely undermine the rights which need to be defended.
The right to associate with whomever you please, and the right to disassociate with whomever you please.
My position is simple. If someone doesn't want to bake you a cake, then that ought to be their choice. They do not have to tell you the reason why, they do not have to explain themselves, they have a free will right to engage in business with someone or not as they themselves choose, and it is contrary to the principle of freedom to force them to do otherwise.
This "Freedom" thing, encompasses the right to say "no."
I agree, but if you are in court about it, you need a defense. And good Christian lawyers.