Another option to consider to upgrade disc performance is switching to Shimano Freeza rotors which have the aluminum cooling rims extending towards the center of the rotor. They used to only make them in center lock, but they've been available in 6-bolt for a while.

We had been using Shimano Ice-Tech rotors for years, and they're supposed to work better because they have aluminum sandwiched between the steel outer surfaces of the rotor. But those don't have the extended aluminum fins . I didn't think the Ice-Tech rotors were any better than plain steel rotors I've used in the past.

After switching to the Freeza rotors, I've noticed a clear difference in performance. I can push these rotors further and I've yet to get them to fade at all even on long descents where I've had to drag them a bit.

We're a reasonably light team at about 310 lbs, so YMMV.