To my eye the second clue works better (and of course made me laugh... of course), but I'm not sure I'd be confident enough to use either with a hyphenated word - that may just be my lack of knowledge of the conventions? Word length helps point you in the right direction so it does work though.

I'll do it tomorrow.