Hm ... I've always considered the movie -- or, more accurately, the original script -- to be canon. However, I also consider Joss' comic to be canon, yet for the purposes of my post-Chosen universe I'm ignoring it. As you said, it's all about good storytelling; the play's the thing.