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.
You're right, TIS. Jimmy was ready to die once it was assured the Colonel's estate would go to Jimmy, and then Jimmy's son in the event Jimmy died.
