For one spoke, I'd replace the spoke. When a 2nd one breaks, it is time for a new build/wheel. You most likely just keep breaking spokes. If it was my bike, I'd get the broken spoke fixed and keep the wheel as a backup. Buy a new wheel, it sounds like you'd be able to get a new comparable wheel for about the same price it would be to having that one rebuilt.

I probably would not buy the wheel at the place you bought your bike. I am guessing that the wheel was not properly tensioned or built. I would not expect a new wheel from this place to be any better. Going to Peter White would be a good idea. You will know that you are getting a quality wheel that will last a very long time. You also get his guarantee about broken spokes or truing. They will cost more than a decent factory built wheel, but you shouldn't have any concerns with any wheel he builds you. And if for some reason you do break a spoke on one of his wheels, you have your back up until you can get your wheel back.