It's looking more and more like Baz is the end of the line for Rogue One line from HT.
Want to be wrong here, but we haven't seen any more hints, announcements, fair/show photos or anything else indicating any more characters other than what we've actually seen.
That's too bad... a Cassian and a Krennic figure seems pretty essential, but not to the folks at HT. The one thing that stands out to me here is how Rogue One would have an appeal more to the adult collector as opposed to the more kid - friendly one, so why not offer more here now, while the movie is the focus of this period?
Very soon the focus will shift to episode 8 and once that happens, I don't see HT or anyone else stepping back to Rogue One for any figures to produce.
Oh well. ..I'll enjoy what we're getting here...