Sadly, this will require an Act of Congress to fix. They need a law against discrimination that specifies that it applies to Executive Orders, all Titles, Amendments, federal and state agencies, as well as any commercial enterprise operating within the U.S.
Somehow, I am not convinced it will happen.