I’m in a similar boat as you and my current plan is to switch to PopOS. They are Ubuntu/Debian based so you will be familiar with it, and they also are a distro that is more focused on gaming, so you will have an easier time with video card drivers.