Norrie had a match point in the third set but recovered from losing two tie-breaks to progress into the last eight.