GOTY tokens - only 22 possible from solos right? late the game trying to figure out if i should be doing these or not.

Hey guys, just wanted to make sure i had this right.

Started on game 4 or 10 so 14 tokens there, 1 from the set, and 1 from TOTY solos. So 16 total at the end i believe 9 short of 25 trade in set right?

No other way to obtain these outside of 180k in packs right?