Surrey back on the right track