A quick update, the recent weekend bounce (abc) was probably a fourth wave, but this also means the end of wave 1 was not at the right location because wave 4>wave 1, so I now think that wave 1 ended lower as a leading diagonal. There is now also alternation between wave 2 & 4 :

So that puts is currently in wave 5 .
More later.............