I did something similar for a show script I had to write once (a spoof of a children's show). I got the original plot down, then worked with a partner to actually go back and insert the jokes we'd thought of while writing the first draft.

Worked out pretty well, though I don't have any awards to show for it.