I'd have the wheel rebuilt with all new spokes and tell your builder to run the tension on the high side to account for extra weight from commuting. Basically, build it like a touring wheel.
While there's argument back and forth about strength differences using straight vs. butted spokes, I prefer to build all my wheels with straight gauge 2.0 (14g) spokes. The vibration absorption qualities that are typically alluded to when discussing the merits of butted spokes are all but gone when you move to a tire above 25mm width. The lower pressures and higher volumes of 28mm+ tires more than make up for the excessive stiffness of a straight 14g wheelbuild under higher tension.