Hi Rob
For proportion I'm just labeling that corrective move from Nov 30th to Dec 4th as either a wave 2 or B.
For the Bears, your Scenario 1 looks fine.
As for the Bulls, I would lable this move 1,2 i, as the start extended wave 3 move. see chart below :)