I will be really tempted to upgrade to X2 as soon as it comes out, and hopefully, any current issues I am having (such as my Rapture problem discussed elsewhere) will be fixed in X2.
I might, however, wait until Windows 8 is properly released. X2 is compatible with W8, and I think it would be better to upgrade both at the same time, therefore not having to re-install X2 when the new OS comes out...