Sounds like you have a great set of climbing wheels in the Kinlins, with that spoke count, over a good pair of all rounders which is what the mavics are. If you do have problems with the front you could try a beefier spoke since you have a bit of scope to make the wheels heavier without ending up with an anchor for a wheel, or changing lacing pattern, but I have to admit I've never ridden with cx rays and don't know what is stronger in terms of spokes. The flange spacing of the elf front hub is pretty wide also so chances are you've got a plenty stiff front wheel already, with potential to build it into a really stiff one.