I encourage you to post that one as its own submission, it's infinitely better.

(I'd do it myself, but you might already be planning on doing so, and I wouldn't want to steal your imaginary internet points ;])