no, I think that as soon that he is free he will join the humani, but he won't die, at least not until the last book. he has alluded to "going to see the Witch" after he is free, but I don't think that he is going to try and kill her or harm her. (he thinks he might get cursed again, probably doesn't know that most of the Witch's power is gone)
I think that he wants to be forgiven, and redeemed, and perhaps take up his rightful place as the defender of humanity. After all, it was the insidious influence of the swords that corrupted him into becoming Mars Ultor, the Avenger, and he has spent thousands of years "sleeping" in the Bone City under Paris.