Yes, you are right. I think that we have to use Super Buu. Kid Buu have the same PL as Evil Buu in the manga. It's only a different skin. If we follow the good order, that's Majin Buu, Evil Buu, Super Buu, AND THEN Kid Buu.
So, my first order was right.
I have said that the KI was draining 2...