It's a no brainer, the One X. To the bit about the Galaxy Nexus getting quick updates, that totally depends on where you buy it from! if it's a carrier locked model then your in for a long wait for updates (my Telstra Galaxy Nexus is stuck on ICS 4.0.1 and apparently Telstra is not that interested in pushing out updates for it...they have this attitude that they are not required to update their phones [which is true, nowhere in the contract does it state they are required to push updates], however, is still a bad attitude to have considering part of the appeal of the Nexus line is it's suppose to get frequent updates). Also, I dunno why people are so hung up on the Pentile display on the Galaxy Nexus for? as it looks beautiful to me and I love it! However, I would of bought the One X, but I didn't want to wait another week for it to be released and got the Galaxy Nexus instead .
You do know that ALL carrier versions of the Galaxy Nexus can be flashed with a stock Google ROM, don't you?