That is my understanding too (also not a constitutional lawyer) so have been of the mindset that best options are expansion or narrowing jurisdiction but as of now not politically feasible
It will be "politically feasible" if we have the majority in the House/Senate and Biden in the WH after November. There is no other way a national Roe law (that Biden signs) will make it past the current SCOTUS. They believe they are above the law and will make up excuses to weaken/remove it.