Scalia didn’t uphold Wickard in Raich, he based his concurrence on the effect of the necessary and proper clause on the commerce clause.
So did the majority opinion in Wickard.