Go Gx. Not worth it to go XT and have to wait 1 year just for them to get stock of the cassette you are running. I'm in the industry and I can tell you now that Shimano have big stock issue and it's not going to end soon. Everyone is switching to Sram.