This is a tough one. I got my Xbone because I had friends on there and while I'm not a big FPS fan, I like Halo. I like reading classic sci fi and lets be honest here, Halo ripped off Ringworld. Further more, the 360 is one of my favorite consoles.
Conversely, I enjoy me some RPGs and the JRPG genre lives almost solely on Playstation consoles in the west. Ultimately, I think I'd stick with the Xbone regardless. I do absolutely HATE what they did to Windows10, merging it with XBL. But that's a company issue, not one with the console itself. Project Scorpio has me interested though. It sounds like a souped up Xbone.
Objectively though, the PS4 is a better machine, technically speaking