+1 , normal 32, 36 3X wheels are the way to go.

If there is a run of those wheels that came on the bike exhibiting similar problems,
Dealer may get compensation from Trek , he can pass thru to you..
NB you did get 5 years/2700 miles of 'wear and tear' out of them , so maybe not..