I vote for new wheel or rebuild. Went through this with my old Diamondback. Broke a spoke every other week all summer long. Shop rebuilt the wheel for $40. Problem solved. And find a better shop - they should have spotted the problem.