Last Mattel Multiverse Figures?

What's going to be released for the companies last Multiverse waves?

Most of the we know of figures are seen here.

At this stage it's not official known what figures will be released before Mattel loses the rights. But there have been figures that were either shown or leaked. Paulmartstore has some of the figures listed for upcoming waves in their preorder section. It's unclear how legit these list are at present.

The Batman Ninja wave in April 2019  has apparently made the Batman Ninja figure into a build a figure. Here's what's listed in this wave:

Beast Boy (A Toys R Us exclusive figure but the store closed)
Black Lightning  (TV, unfinished figure shown at SDCC)
Flash/Wally West (Rebirth, shown at SDCC)
Nightwing (Rebirth, shown at SDCC)
John Steward (Shown at SDCC)
Starfire (The outfit she wore as part of Damians' TT, shown at SDCC)

The Killer Croc build a figure wave is listed for June. Which is right in time for the Batman anniversay and here are the figures that are supposedly in this wave:

Red Hood (Rebirth, unfinished figure shown at SDCC)
Red Robin (Rebirth, unfinished figure shown at SDCC)
Katana (Shown at SDCC)
The Beast (KGBeast maybe?)
Alfred Pennyworth 
Batman (Grayson)

I'm hoping Mattel doesn't drop any accessories or extra heads. The last three on the list haven't been seen anywhere beforehand although Alfred and Grayson have been rumored. Personally I would have preferred a new Cassandra Cain figure if it had an unmasked head since I don't care for the Orphan persona. Alfred might be okay but two Dick Grayson figures so close together seems odd.

If this is all true it also leaves some open spots for other figures, at least the ones we know about.

Black Canary (Rebirth, shown at SDCC)
Hawkgirl (Rebirth, shown at SDCC)
Mammoth (Build a figure, shown at SDCC)
Ninja Joker (Build a figure, shown at SDCC)
Bizarro (Not Rebirth, it was supposed to be a Walgreens exclusive but hasn't been released)
Flashpoint Aquaman (Shown at SDCC)
Impulse (Which was leaked not officially announced)
Catwoman (90s Purple suit, which was leaked not officially announced)