Lots of options.

Assuming that all of your broken spokes are on the rear wheel it looks to me like the issue is "spoke bracing angle". The dishing required by the cassette + the disc brake + the 130mm dropout spacing result in a relatively narrow spoke bracing angle. I see 3 choices: 1. Rebuild your wheel the way that it was - it's given you 5 or 6 years of relatively good service. 2. Widen your bike's triangle and install a 135 mm rear wheel - gives you the satisfaction of "improving what you've got. 3. All new bike - what we'd all like to do but it's more expensive and what are you going to do with the old one.

I like to jack around with bikes so I'd pick #1 but I'd relace the back wheel with 13/15/14 gauge spokes to provide a little more meat at the elbow bend. That'll keep everything else the same except for the part that's giving you trouble.