You have identified a root perversion. Roscoe Filburn’s wheat did not leave Ohio or even his farm. He didn’t offer it for sale; the wheat was for his own use. It was deemed to “affect interstate commerce” and thus within the scope of the interstate commerce clause. With that, a provision intended to remove power of states to tax each other’s goods and services and promote a free trade zone instead became a mechanism to nitpick and micromanage every last little detail, ossify existing practice, protect large players, give loopholes to the politically connected, and enable mass regulatory capture. It cannot be overturned quickly enough.
I don't see SCOTUS ever overturning Wickard, sadly. Too many federal programs and regulations would lose their legal basis if that happened.