We need to overturn Wickard v Filburn, and stop Congress from creating bureaucracies to regulate anything they can "find" to have a "substantial effect on interstate commerce". Read Clarence Thomas' writing wrt the Commerce Clause. He gets it.
If we need the federal government to regulate things they weren't granted the power to regulate by the original intent of the Constitution, we can do that by amendment - that's what it's there for. What we have now is an open-ended grant of power with no discernible limits, and they have proven over and over again that they cannot be trusted to exercise that power within the bounds of common sense or common decency.
Not going to disagree with you there.
If Wickard is undone then we don’t need much more. We hold the Congress for 40 years and let the courts do the rest.