Yes, unfortunately immigration and “perfect life plans” are not always compatible… we sometimes have to live by immigration timelines not the timeline of our choice.
I’m aware you stated in a previous post your partner wasn’t quite ready to get married yet. But, they might consider getting married now and filing now because with immigration timelines you’re probably only looking at moving to the US in late 2024 by the earliest!
And if a waiver for overstay is required that will add another 12-18 months to your eventual move.
If you know you want to be together in the future, start making plans for the next 3 years now…