Ending diagonal is now very doubtful
I think US markets count best with a corrective triangle, most prominent in the NDX and SPX, which started with the January pullback. From the mid-May lows in NDX, SPX, INDU I count 5 waves up, forming at least an intermediate top. Since triangles preceed the last move of the larger degree of trend, prices should retreat at least to those mid-May lows.