If and when you can afford it I strongly recommend carbon rims for weight savings and lateral stiffness. I run XX on my bike as well and even with XX1 out I still can seem to see the benefit in changing other than a small weight drop.

 And how much does a pair of carbon rims costs? It sounds good !