I'm going with that fan-made ending as the official one. Can't say I'm too happy about C.C. dying there either, but you can't have the cake and eat it too, isn't that how the saying goes? Lelouch ala 2300 with long hair and evil smirk is so canon
The story coming around full circle isn't something new but it would've been satisfying in a twisted sort of way.
It would've been nice to see more Lelouch-strategies that don't rely on Geass. (But instead on immortality? not something to rely on, is it.)