RT or EF?

If I'm analyzing the current short term rally's structure correctly, the market is reaching new highs with a corrective structure...

Compared to the running triangle, the expanded flat would have a perhaps more "proper" size, would break some important pivot lows, and would reach the base of the current medium term channel.