I wouldn't have minded them staying like that for a while. Despite mind-switch usually gets annoying really fast, their personalities work wonders like that.
Also they stayed condident as themselves despite circumstances wich is usually not the case in this trope.