How dry is your filament?
I’m evaluating the same as the OP. I’ve had an A1 mini for about a year now and I use it more than I thought I would. Mainly printing household stuff, tools and dust collection items for my woodshop, and parts for my vintage Macintosh computer museum.
So if I went with the X2D, I could just use it like I would use the P2S until I needed a feature the P2S doesn’t have, right? Is it that much more complex even if you’re not using the extra features?
First, I have to ask you a question in return:
What are you hoping to gain from switching to a different printer? What do you need that you don’t have right now?
I want to understand why you want to switch. 
I’d like to print ABS. I’d like bigger prints. I’d like to use cheap PLA for supports while printing with costlier filaments. I’d like to print with TPU and PLA in a single print occasionally. I’d like to print 2 color with less waste. I’d like an enclosed AMS so I can keep my filament dryer.