At first I thought Jimmy really wanted to make amends with Nucky, but I think in the end he did know he was gonna get killed. His last moments with his son seemed meaningful to him. And, I think he wanted to die, thanks to his sicko disgusting mom.
TIS
"Mankind must put an end to war before war puts an end to mankind. War will exist until that distant day when the conscientious objector enjoys the same reputation and prestige that the warrior does today." JFK