I fully agree with your analysis. We are finishing wave 1. I would expect sub-wave 1 of wave 3 and to make a Fibonacci extension to see what can be expected from wave 3.