I wouldn't change machines based on your stated reason/s. Your Windows 10 system will run fine for a number of years. At best, if you have a small level of RAM, you might want to upgrade ... but I wouldn't go with a Win 11 for your reason/s.