Sorry I didn't get back to this sooner. I loved the one you did, though I also like both of those ideas, and I'm always keen on happy banter between the original team.

(I was also rather amused by the joke in the title. I still need to watch that film sometime.)