Aw. Look. It took a lot of time, but I came to love that Leo. If it's set in the PD universe, I agree that I'm gonna need him to be the Ronin AND live through the end.

He can wrap up the film by doing the Leo thing of seeking to find peace and regain what he'd lost of himself.