Yes, but to be picky what wasn't obvious is that May would strike a deal, I think that was touch and go, but it's there now so yeah, those are the options as it stands.
However it might still be possible to ask for an extension in order to explore a completely different agreement, Norway or whatever, but there doesn't seem be any majority in the house for doing so, or any agreement on what to go for anyway, so it doesn't seem likely.
The one thing I expect us both to agree on is that any politician that claims we can just go back to Barnier and get a better deal, without being able to give any reasons why, or that they have some sort of super-competence, previously undemonstrated, to get 'get a better deal' should be shot.