Htc One Wifi Reception Problem

I recently bought an HTC One X. Last year's model is now at a good price compared to the alternatives.

Worked well for a week but now the wifi reception is dreadful. Cuts out, has to be very close to the router to get a decent signal.

After an internet search I found out that there is an antenna connection problem in a number of these phones. I used the check suggested, by squeezing the phone in a certain place, and sure enough, full reception then back to poor after letting go.

Anyone else in Thailand have this problem?

What are my options?

Should I return the phone and hope they exchange it? I've had it for only two weeks. But if the next phone is from the same batch it'll probably have the same problem

Find an HTC repair shop (I don't really want to do this as there are some bad stories on the net, besides I am in Phuket and doubt if there is a place here).

Live with it?