I simply returned my guitar to the shop and swapped it for another one, as it was still under warranty :-)

Now then, it's second-hand guitars that are the real problem...