From the genres you seem to prefer, clearly PS4 is the right choice.
Japanese home console support is the best on the Playstation systems. Just look at PS3. Sure it took a while, but there is a JRPG galore on the system. With how well the PS4 is doing, this support should easily switch over to the new console at some point. Plus Sony has a history of supporting their systems in the long run with amazing games, i.e. Last of Us, Beyong and GT on PS3 last year.
All in all, PS4 is looking to dominate this cycle. Just on board without hesitation.