I love my one x, especially with viper on it... that being said, had I not gotten it in May,I would have waited for the note 2... great software support, dev support, and Samsung is finally upping their game with the displays (ditching penile matrix displays)
The one x+ is Badass as well.. if having a stylus isn't your thing, and you want to spend less, go with the x+... it has viper rom in the dev support as well (same dev as the one for viper on my phone)
Just know that there's no wrong decision, both phones are awesome..and no matter what, in 6 months you will regret not waiting for the HTC one ? or the note 3