Any other suggestion except for switching to Windows 10?
I'm really comfortable with 8.
Windows 10, or Linux.
Seriously, I do not know anyone who was happy and comfortable with WIndows 8. Windows 8.1 was marginally better, in my opinion.
If you upgrade to Windows 10, I believe you will be very comfortable, and glad you did. There is a reason why Windows 8.x was such a miserable failure, not that Windows 10 is winning any contests.
Upgrade, be happy.