I don't see SCOTUS limiting federal regulation on activities that involve both commerce and interstate movement any time soon - it has little to do with the drug war. Do you honestly see that, when the most originalist member of SCOTUS isn't going there?
I don't see what any particular contemporary court might or might not do being a measure of the original intent of the Constitution. At this point exactly where Clarence Thomas has or hasn't gone with respect to the question seems to be mostly speculation based on two word you picked out of a decision and extrapolated to your satisfaction.