You can certainly wait if you want - the other option is to sign up and edit in your unrevealed work later. Sign ups are editable until they close on July 20.

Yep, offers have to be canonical as well. This is because of how AO3 challenges work when you don't use a fandom tagset. I would suggest choosing the more specific version, since that's what requests will be doing.