Short-term, at least one idea to fix this is to implement more stringent checks/QA with their FBA policies. Do more stringent verification of imported items going into Amazon FBA warehouses. Or at least add a mark to branded items received from other third-party sources. Simply adding "Shipped by: X, Sold by: X" text on the product page doesn't really help.
There's probably other/better ideas out there. This has been a recurring problem that has kinda gotten swept under the rug so far, but at some point is going to need to be reckoned with.
If Amazon wants to be the best customer experience, then it has to position itself in such a way that it does not devolve into one big flea market + Aliexpress + dropshipping junk bin.