There won't be a credible deal that May can put to the public so we can probably rule that out. A straight fight bewteen Revoke and No Deal would be the most likely option. It has clarity, that's for sure.
I'm not sold on a 2nd ref to be honest. The only sane option is revoke as any deal, may's or otherwise, will not get through parliament (unless there is a GE). A 2nd ref is of course a half way house but its still a shit option just the least shit one left so still doesn't change the fact that its shit!
To have a revoke v no deal also presents "no deal" as a credible option when it simply isn't - its a lie of ridiculous proportions but something that can be sold lock stock and barrel to the ignorant masses (I know you aren't suggesting it is!). You can hear the nonsense already, we'll stick it to EU, we'll punish them by keeping our 39bn and save the nhs/schools/fishing industry (basically whoever they are talking to), we won the war, blah, blah... i.e. easy simpleton-trump politics for bojo and frottage to spout.
Also add in the reality that the EU is currently allowing the UK to stay. If as expected frottage and his right wingers do well in the eu election and the tories place a anti-eu idiot in the hot seat then why would they ever extend beyond October? They'll just say you're out and have your referendum and we'll let you back in if the decision is to revoke otherwise stay as you are. Of course to then extract any trade deal or even to lift transport pressures from them they'll immediately say then they want the 39bn and the backstop in place for NI then they'll talk - the "no deal" lie.