Wow six months in the far east and then six months in europe? Lucky
Personally, I would probably stick with the 505. Just get it replaced under warranty (hopefully for free), and give it another go. You might want to invest in a good, protective cover for it. The one it comes with does absolutely nothing to keep out dust and moisture. Something with a tighter seal and maybe some padding would probably be a better choice for the rigors of travel.