Surrey make it two wins from two matches with a comfortable four-wicket victory over Yorkshire at Headingley.