Unbundling the app store would have been the right solution
Then it would be feasible for say Samsung to create their own Android flavor. Now maybe people might not want it, but there are plenty of vendors making phones so even if Samsung only sold Samdroid phones you'd have plenty of options that would still sell traditional Android with all the Googly bits. Or you could buy a Samdroid and install generic Android on it.