Maybe, outraged, I'd have to read up on the case again...
I do think that it's right that if you consent on a certain basis, if the other person deliberately and knowingly changes that basis significantly (such as removing a condom) or sets out to deceive you on a significant basis (such as persistently misrepresenting something significant about who they are) then the consent can be judged invalidated.
I've argued before that it might be best to not have a rape charge, in line with some other jurisdictions (maybe Canada?) that have degrees of serious sexual assault instead. Here, causing death by dangerous driving, say, is a different charge to murder, but is still a very serious charge.
In the case of the hotel rape by the man going into the wrong room, he could have then been found guilty of, say, "causing serious sexual assault by recklessness/drunkeness" (there is no doubt that the woman in the case was penetrated without her consent)