I would bet Trek will send you a new wheel if you have your faulty one sent back as a warranty claim. A less-than-1 year old bike should not be breaking spokes. It will also be a machine built wheel that they send, but you can get a competant shop to re-tension and true the new wheel for a few $$, which really gets it 99% as good as a hand built wheel. I would not necessarily get the shop you are now dealing with to do the re-tensioning, tho - find a shop that does a lot of wheel building and pay them to do it.