I agree with your main theory. I had been trying to count the subwaves myself in that green question mark area and I kept coming up with 3 sub waves with 4 and 5 still yet to come.