If it’s not broke don’t fix it. I’ll just stay with what I got until my computer goes out.
You might even consider getting one of the $25 copies of Win7 and hold it until you have to get new hardware, then install it in place of whatever the manufacturer pre-installed. If that happens before 2020 (when the Win7 security updates will stop) it might be a worthwhile investment in sanity.