No way, keep the XT on it, lighter than Saint and plenty strong enough. Its a lovely looking bike, especially polished with the gold linkage. Saw a few of the 07 ones in France this year, including Nico on his, they weren't hanging around!
I'm surprised that single pot XT calipers would have enough power to stop such a beast (it looks very light though). They must know what they're doing!