Next time have the mechanic who trues your wheels stress the spokes at least 3 times.
Trek's in house wheels are not the greatest.
Hand built wheels, with good components, are a great inve$tment.