Magura rock
Stick with the clipless you will find a big difference in climbing, but don’t throw out the platforms if you like the rough stuff.
By the way disks and XC don’t mix. The disks take a beating. I use Magura hydraulic rim brakes, they rock but you will need decent rims to run them.