Make it a “two-fer”. The commerce clause was abused by FDR for his New Deal; but LBJ used the general welfare clause to create his “Great Society” welfare state.
The way around this will most likely be a major SCOTUS decision that differentiates between organizational clauses and secondary clauses of general principles which do not by themselves authorize organization outside of the organization clauses.
Joseph Story wrote this, from Commentaries on the Constitution. It's in reference to the Commerce Clause, but speaks to federal powers in general:
The question comes to this, whether a power, exclusively for the regulation of commerce, is a power for the regulation of manufactures? The statement of such a question would seem to involve its own answer. Can a power, granted for one purpose, be transferred to another? If it can, where is the limitation in the constitution? Are not commerce and manufactures as distinct, as commerce and agriculture? If they are, how can a power to regulate one arise from a power to regulate the other? It is true, that commerce and manufactures are, or may be, intimately connected with each other. A regulation of one may injuriously or beneficially affect the other. But that is not the point in controversy. It is, whether congress has a right to regulate that, which is not committed to it, under a power, which is committed to it, simply because there is, or may be an intimate connexion between the powers. If this were admitted, the enumeration of the powers of congress would be wholly unnecessary and nugatory. Agriculture, colonies, capital, machinery, the wages of labour, the profits of stock, the rents of land, the punctual performance of contracts, and the diffusion of knowledge would all be within the scope of the power; for all of them bear an intimate relation to commerce. The result would be, that the powers of congress would embrace the widest extent of legislative functions, to the utter demolition of all constitutional boundaries between the state and national governments.