So, I bought one of these Sony T1s that freeze and crash

but apart from this problem, I love it.
I've arranged with Sony to have it sent back. They were a bit slow about it, otherwise it would have been back with them already, but now it looks like it's being picked up tomorrow or Friday.
However, I'm having some second thoughts

I first thought send it back until they've sorted it out, and then maybe buy a new one a bit later one when it's certain that the problem has been sorted (at which point the price here might even have gone down a bit).
On the other hand, if there really is a fix at the end of the month, I could just keep it and wait for that. But I don't feel confident (yet at least) that whatever comes will fix the issue permanently.
What do you guys think? Keep it or send it back?