I've revisited some earlier counts, and based on the current setup, I've decided to move away from the complicated intermediate wave 2 correction, and settle on a simple ABC with a volatile A wave instead.
Minor wave 1 moved to previous X wave, minor wave 2 replaces the previous Y wave.
Current setup just broke above an intra year downtrend, and normally, this line would see a retest. Based on the interlinked series of 1-2's the chart suggests that we are looking a the start of a big, explosive move up.