That's what I believe as well excluding that last part of Geralt dying... Doubtful he does. Probably just feels like shit, sits a bit being sad then notices the monsters, goes to super rage and kills them, back to being sad. Probably turning into a grumpier person + drunkard or so.I like to think that ciri lives anyway and what you say to her have impact only on her choice.
1) She return to you and became a Witcher.
2) She return to became an empress.
3) She survive but doesn't return. Geralt dies thinking that Ciri was dead.
Can't take it seriously either that he would let drowners and simple ghouls kill him, that's just lousy no matter the circumstances