I agree with most of the above comments, but not sure about replacing the rims.
My girlfried and I went on a 35000 mile trip round Asia, Oz & NZ, including a few pretty rough roads. She was on a XT600E with the original steel rims and heavy duty spokes, I was on a tenere with its original fitment alloy wheels, also rebuilt with deavy duty spokes.
She had no wheel problems, but I developed a number of cracks from the spoke holes, which had not been modified, and then had spokes breaking. I had a new rim and spokes sent out to me and had the wheel rebuilt in Bankok, but the problem soon returned.
On this ocasion it was caused by the aftermarket rim having spoke holes at the wrong angle for the hub.
Tried again in Oz, the wheel builder knew all about having to adjust the holes in the rims and had an impressive list of customers, problem returned in less than a thousand miles.
It could be that still using the original shock played a part, but so was my girlfriend !