HTC 8X or Lumia 800 for one more year?

I'm typing this on a Nokia Lumia 800 which I've owned for about a year. I'm getting quite bored with it and I'm really lusting for the HTC 8X. I'm now seriously considering signing up a 2 year contract for an 8X since my 800 is unlocked. But what I want to now is should I get the 8X or should I wait a year and get a WP 8.5 (or whatever it will be) phone?