Personally, I'd stick with the stock wheels. Ride em a couple hundred miles then take them in an have them retensioned by a competent wheel builder and you should be fine. While you are riding it, order yourself a set of Zipp 404's. Get the clyde version if you are worried but I think their standard wheels work well enough. The Zipps aren't the lightest wheel but they are very, very fast, very strong and they'll make that Pinnarello look extra sweet.

People get too caught up on spoke count and forget about the more important factor, the wheel builder. Good components built by a competent wheel builder will give you a solid wheel set no matter how many spokes there are. I have a set of 16 spoke wheels that are 10+yrs old with many thousands of miles on them.