Switch still has more than both combined. You can't count Rayman and GTA V twice. They're one game each!
PS4 + XBONE:
GTA V
Last of Us : Remastered
Flower
Diablo 3
Rayman
FEZ
Swtich
The Legend of Zelda: Breath of the Wild
Super Mario Odyssey
Celeste
Bayonetta 2
Mario Kart 8 Deluxe
Shovel Knight: Treasure Trove
SteamWorld Heist: Ultimate Edition
Or remove Bayo 2 and add the collection. Simple.