I imagine this will be the last wave of '07. Hasbro said they'd do one before year-end, and with Waves 2-3 set for Sept/Oct release, that would put this wave set for just around the holiday season.
I think the bonus wave is just going to be Wave 2 ahead of schedule and if we are lucky 3 by the end of the year. Lets not forget Comic packs in the mix at the same time.