Just get a new wheelset,or have the rear one rebuilt if you don't trust it. Two broken spokes on a stock wheelset is nothing.
I stopped commuting on my Big Buzz because the alloy fork would bother my carpel tunnel if I rode it every day. My one and only complaint about the bike. Still use it for occational running around town,and would commute on it again if I found a reasonably-priced disc-only carbon fork. Love the gear range,handling,riding position,versatility,looks.
__________________
C'dale BBU('05 and '09)/Super Six/Hooligan8and 3,Kona Dew Deluxe,Novara Buzz/Safari,Surly Big Dummy,Marin Pt Reyes,Giant Defy 1,Schwinn DBX SuperSport,Dahon Speed Pro TT,Brompton S6L/S2E-X