Well done on the brake swap. I HATED my caadx because of those cantis. Even after a move of the front brake cable mount they still squealed.

I would get some of the Hunts listed above. Much better and lighter wheels than the stock ones.