A good start, but ...
Not quite far enough. Needs:
* When sold it should be prominent on the box/web-site when the support for the device ends and when guaranteed availability of parts ends.
* Security updates should be available for 10 years. Feature enhancements can stop quickly, not so important.
If a vendor wants to stop security updates early it can if there is a user friendly way of replacing the OS with something long term supported, eg Replicant or LineageOS.
* Apple/John-Deere style blocks on independent repairs to be out-lawed.
* Spare parts & tools to be available at reasonable cost.