Take the current wheelset to your favorite wheelsmith and have that person true up the wheels, even the spoke tension and check that the spoke tension is close to the upper limit. This will give you the best life you could expect from a OEM stock wheelset. Eventually (assuming you ride regularly) you'll start having problems with those straight gauge spokes or problems with cracks at the spoke holes. At the sign of the first problem, start shopping around for a new wheelset. You can start at 36 spoke Vuelta HD's or something similar. Or, go back to your wheel builder and have that person build you a stout 36 spoke wheelset using a high quality rim, double (or even triple) butted spokes and attention to detail.
-Kedosto