I'm sorry to say that there are wheels which just don't cut it and will continue to loosen spokes even after being rebuilt. Hence my mention of Alex rims in the other thread on this issue.
I would be very careful taking any offer of a replacement wheel from the shop, too. It is highly likely that you will be given a wheel with a lower level of hub and probably spokes as well.
It really should be a warranty issue, and if you could track down the US distributor of Giant and start talking to them, you might shortcircuit some of the BS that will come from the shop.
Personally, I would let it go and upgrade anyway. There are deals everywhere for good wheels, and you can't be that hard up for cash as this bike came from the insurance on the stolen bike anyway.