You are correct, except perhaps for meth. The amphetamine family, for sure, but if I understand correctly, the "meth" part of methamphetamine changes the drug to skew away from people seeking self-medication. I also think it's far too addictive to say anyone can self medicate with it.
However, nearly all stimulants are used to self medicate ADHD. From nicotine, to caffeine, to sugar, marijuana, and cocaine, it isn't terribly unusual for someone to have found something that works for them.
I am aware that marijuana is not a stimulant - but it's certainly something people with ADHD self medicate with, and would be a much better fit in your example than meth.
Your friendly neighbourhood ADHD nerd.