Yes, right choice.
The big differenced compared to the PS3/360 era is that Square (and other devs like Capcom) tried to pursue the Western market by making Western-style games or games inspired by Western games foremost and that clearly doesn't work. Now they know that Western fans like Japanese games because of their intrinsic Japanese style and nature and they need to double down on their strenghts. NieR, Kingodm Hearts, FFVIIR, and other series like Persona and such show this plenty.
Now that they know their strenghts better and have their shit much more together than previous gen, I can see the next generation being really good for Square Enix.