TMC figurines. I cannot get them all.

I have beaten TMC twice now. I cannot get figurine#22 and the additional 4 figurines have not been unlocked. I completed the game before I started collecting the figurines. After I beat TMC I thought it would be nice to start getting all of the figurines and now I am stuck. The Figurine Guy tells me that he has no more and to come back later. Thinking that if I defeated Vaati again would allow me to get the rest of the figurines proved to be untrue. I went back after defeating Vaati again and the figurine merchant still says the same thing. He had no more and to come back later. What is going on and is there any way that I can get #22 and then the additional 4? I would really like to get everything in the game and this is very frustrating to me. Please help!!!!