Given their fairly lacklustre progress in the past 20ish years [0], I doubt they’ll manage to make it much better within the next two.
Windows 10 going out of support is not going to cause the computers to stop working and become e-waste. Commonly used software (such as web browsers) will continue to support Windows 10 for a few more years; Windows itself may be less secure, but for basic usage and with a restrictive firewall, it should be fine.
If you’re concerned about lack of support for Windows 10 and want to switch to a supported OS, you’ll be better off using Linux.