As far as my experience with Moto X Pure goes, this phone is worth the upgrade for you, theoretically the processor and RAM may seem weak points to you compared to OnePlus 2 but after having used both I’ll say Moto X Pure is a superior phone compared to OnePlus 2, no overheating, stock android, loaded with lightweight nifty tools from Motorola, rugged build quality.
Even though OnePlus 2 is theoretically more powerful I’ve observed more lags and stutters on OnePlus 2 compared to that on Moto X Pure, Moto X Pure performs way more smoothly compared to OnePlus 2 and its camera quality is also better, besides that Moto X Pure also has better battery life compared to OnePlus 2, and as far as display quality is considered Moto X Pure is leagues ahead of OnePlus 2 in that department, this phone is indeed great.