Rattles can come from lots of places, from truss rod inside the neck, to strings rattling against the frets to wires rattling around inside that hollow body.
It could be time to study up on the basic construction of your guitar. I'm not suggesting you pull out the soldering iron or anything like that, but you should be able to track down a rattle and determine where it is coming from.
With a little research, you might find something you can fix with a twist of a screwdriver vs. sending away your guitar again for 3 weeks. Being under warranty, I understand the inclination to have them fix it, though.
...so ever since then, I always hang on to the buckle.