I was in the same spot back in June. My 2012 Lenovo laptop was showing signs of age and getting cranky, and my needs for RAM, processing speed, and storage are getting more demanding. I do a lot of Corel Draw creations, some video editing, and a little bit of photo manipulation.
Like you, I considered converting to Apple, because so many of my friends, family, and colleagues swear by them. However, I decided to stick with a Windows 10 PC and avoid the frustrating process of starting all over again with a new operating system. I wasn't concerned about transferring files, because I have multiple backups of everything on several types of storage devices.
After considerable research, I ended up buying a top-rated Dell XPS15 (9570) wih the newest Intel i9 processor, 1 TB SSHD, 32 GB RAM, touch screen, and lots of other goodies. So far, I love it. The keyboard is as comfortable as the best Logitech we have on the desktop computer upstairs. The touch screen is handy sometimes. Lightning fast. Excellent graphics and resolution. Good battery life. Don't ask the price.