When using 1011 as the end of Primary-2, then we need to keep an eye on 2170 (versus 2200) as a possible peak for Primary-3; where currently underway Intermediate Wave-5 of Primary-3 from the 1810 low is equal to the 360-points of Intermediate Wave-1 of Primary-3 from 1011 to 1371.
When using 1371 as the peak of Primary Wave-1 and 1075 as the low for Primary Wave-2; a 1.62 growth factor for Primary Wave-3 points to 2215 as the peak.
Also interesting, when using 1344 as the peak of Primary Wave-1 for 677-points and 1075 as the low of Primary Wave-2, (with the subsequent movement from 1344 to 1075 as an Irregular Flat), a 1.62 growth factor of 676-points places the end of Primary Wave-3 at 2170 again.
Either way, the end of Primary Wave-3 is approaching somewhere between 2170 and 2215 over the next few weeks.
The upcoming Primary Wave-4 correction should seek a Wave-4 of lesser degree, which is 1810, as you stated. But to get there by July 1st would require a violent decline.