You missed Scalia in your prediction and Stevens retired - replaced by Kagan.
Sorry, shouldn’t post when so tired. Kagan will vote the same as Stevens, who wrote the majority opinion in Raich.
Scalia is a bit hard to guess. His former clerk, Sutton, just voted to uphold the law. Scalia concurred separately in the Raich case, and much of Sutton’s reasoning relied on Raich and Wickard. For example, he pointed out that “inactivity” on the part of a hypothetical person who bought Angel Raich’s house would be illegal under the commerce power if she left her plants behind. I’m going to guess another separate concurrence is coming from Scalia.