That would also invalidate the civil rights act, as the (similar) 19th century CRA was already struck down because the 14th amendment binds against discrimination by public not private actors. The reason why the modern CRAs weren't also struck is because they rested on the laurels of Wickard v Filburn declaring the CRA (this time) is about regulating "interstate" commerce.

That would be an improvement in the same spirit, as the modern CRAs are also unconstitutionally limiting over what one chooses to do with their own property. The scope should be limited to government-involved services and facilities, as those must serve all possible taxpayers. We live in a more connected, option-saturated information age where even bigots more often than not understand the utility of at least doing business politely and making nuanced exceptions. Egregious offenses are corrected by social pressure and business competition. The current regime of ambulance-chasing liabilities inserted into every organizational, contracting, and hiring process harms far more people of every race and sex than it helps.

fixing the interstate commerce clause is one of those things that needs to be done eventually, but will likely never be done - even if just to "fix" it so everything remains the same but is based on simpler allocation of powers than through a "loophole".