1) No, I don’t think the federal government has broad authority to take actions based on the “general welfare.” Its powers are well defined, and anything not specifically granted to the federal government is reserved by the states.
2) No, I don’t agree with Wickard. I don’t think it fits an original or even reasonable reading of the Commerce Clause.
None of this means I support legalized drugs. The states certainly have the authority to restrict pretty much whatever they restrict, including homosexual activity (SCOTUS usurpations notwithstanding).
Of course, we are well, well beyond all that now. Ending the drug war is far down on my list. Short of revolution and all the massive risks that entails, we aren’t going to change 80 years of socialism overnight. It’s going to take time. I’d like to see some push back toward the right. That’s a reasonable expectation.
That's the thing about restoring freedom - you don't centrally plan it. Some people work on firearms freedom aspects of 80 years worth of socialism, other people work on pharmaceutical freedom aspects of 80 years worth of socialism. That's how it goes with freedom.
Rolling back the police/prison state may be down on your list, but it's nearer the top of other peoples' lists.