Exactly, find another shop that knows what the heck they are doing. No way should 36 break under you.
As I've mentioned before, to many bike shops true the wheel (straighten it) but don't pay attention to the spoke tension. After 200-300 miles, the wheel will end up damaged if the tension is not adjusted. AND TOO MANY READERS DON'T PAY ATTENTION TO THIS ISSUE EITHER!
Yes, they argue that they applied spoke prep, loctite blah blah blah but it does not hold. It needs to be re-tensioned after 200-300 miles. If it broke before 300, the wheel builder is totally incompetent.
I started building my own wheels for this reason, hundreds of dollars spent on expensive shops that don't know squat. I am now using a wheel with 28 spokes and have over 8000 miles on it, and I am using narrow tires (700 X 25) at 120 psi. I have been about 255 lbs in recent months.
If it were me, I'd demand that he rebuild the wheel using new spokes. That is a fine set up, no reason you should have that problem, it's the builder.