Leave as is and continue story.
Like really, we have so many unresolved plotlines that can be continued at any moment, that there is 0 reason to do any skips or other bullshit at all. From all the stuff we have around and brewing, they could make 5 expansion if they want so.