Incomplete Wave B with Subwaves mapped

Here is my Incomplete Wave B with sub-sub waves mapped. I just want to post this out there to see if I am correct or whether the waves play out differently.

For progressively zoomed out Wave counts, start here: