I love, love grab-bag waves but if they're keeping BAF as a concept, at the current price point, keep it VERY thematic. I'll happily buy a whole wave of randos if I like them but there really should be consideration for theme going forward for BAFs.
FWIW, back in the older days, I found I always had to buy ONE figure I didn't want for a BAF but at cheaper prices I considered tht one figure the price of getting the figure I did want, like an imperfect two-pack. These days that's an expensive tax on a luxury hobby.