Pint X owner, what should I upgrade to??

I have an Pint X with 1200 miles, and I love the thing, but im ready for more power and range. I was thinking about the Pint S, but it really isnt diffrent than the Pint X. Everything ive read is pointing me into an XR instead of a GT becasue of the issues and how its a "brick" the XR seems perfect. Should I look to buy an XR from fb market place or should I wait a little and buy the new XR Classic. Or should I save my $$$ and keep riding my Pint X till it breaks.