While Samsung's share in DRAM will be secure, their share in NAND is a lot less safe. With regards to SK Hynix I expect them to switch their Chinese factories from DRAM to NAND production progressively because of the sanctions on EUV tool imports to Chinese soil. SK Hynix has made massive investments into their Chinese chip production operations and they seem to be there to stay. Although the lack of possibility of EUV imports is bound to bite them.
Like I said I think Samsung's logic position in the future is quite weak given their own problems with yields and the massive investment TSMC is putting into 5nm and lower process factories. TSMC is probably going to obliterate everyone else in that segment unless there is some kind of major event. From the current situation where you have TSMC, Samsung, and Intel as a distant third in logic, it will be just TSMC at resolutions lower than 5nm. Samsung will have so limited yields that if it wasn't for their other divisions, like consumer electronics, they might have closed down.
I would disagree that China gave up the leading edge in favor of spreading development more to all areas. The truth is they are massively ramping up in all areas and they only aren't pushing in cases where they can't because of sanctions or whatever. The Chinese stock exchange has also given their semiconductor sector a massive cash infusion to fund all of this.