What I would do is ask the shop to true/tension/stress relieve both of your wheels and ride it and see if another spoke goes. If you have another spoke fail I would look into getting a nice set of wheels built by a good wheel builder. For components there are lots of great options out there that can more than easily handle your weight so I would go with what your wheel builder recommends.

I would also look at switching to a different type of tire if you are wearing them out that quickly, there are some great options out there that will last significantly longer than what your old one did, probably ride better and not cost a crazy amount.