Buy X10 or wait for replacement?

I have been considering an X10 and following the discussions of the orbs/sensor issues, and am trying to understand what happens next.

If f I want an X10 with the new sensor, I have to buy from existing stock then send it off to Fuji? Or wait until a successor model comes out with a fixed sensor? Any idea when such a successor might be available?

Fuji will not replace any sensors on existing stock, only when a customer sends their camera in, correct? If so, that might tilt my decision in another direction...
--
http://www.flickr.com/photos/uncamikey/