you might want to try out a few newer bikes (might not be easy in lockdown) if moving from 26″ trad geo – I’ve gone from that to a modern XC and they are far more capable than you would expect
I also used to do red trail centre on my old 26″ bikes, unless you’re really hitting the blacks hard are you going to be overbiked most of the time?
Voodoo Bizango carbon (halfords) has more modern angles so might be a compromise?