The market is still chopping it out. Since my 7/21 post, the options presented then still exist (nested 1-2, i-ii and the wave 4 flat).
One additional option I have added that plays with the choppy overlapping waves up is a potential ending diagonal for wave (5). We'll see.