he learned to be happy, saved the part of himself, that was still suffering from trauma, from drowning (metaphorically) in his pain. in my opinion, it can be assumed he dies naturally and with his new found family, and he does not drown himself for real.
At last chapter, did he drown himself or did he die of natural cause?