Actually I believe the canon ending is Good Intentions, but it's a bit of a pain to get as it requires a certain amount of fiddling around *on top of* having enough energy.

It does however leave Nod fully alive and Ollie at least "unknown", instead of expired.

That seems to be about the best compromise you can get, given the circumstances...