http://www.gameinfor...-wild-hunt.aspx
The first sentence, "he has his memory back", so yeah, full restored ^^
If CDPR sticks to the lore and the books (as they already did so far IMO), Triss won't stand a chance, because Geralt will always prefer Yennefer, there is no doubt about that, even his friends can't believe why he is so besotted with her. Nevertheless he had a similar relationship with another woman in the books slighty shorter as with Triss, but the very first moment he hears where Yennefer is, he packs one's bags and is going for her asap without even saying a real goodbye to her (kinda harsh).
So yeah, just according to the books, it would be OOC for Geralt to stay with Triss.
It's actually not a conflict between Book Geralt or Game Geralt, it's more like Geralt vs the Player. While the player wants to choose, Geralt already had chosen his woman, even in the game he did it already by sacrificing his soul/life for her, you wouldn't do that for any person.