My waves may have been a bit premature. After re-counting the correction waves, I believe we just witnessed impulse wave #1 into a breakout of the downtrend line. Exactly what we were looking for.
In the end there not much that changed from my previous chart :)