Justin Thomas rounded into form late in the third round at the Zozo Championship at Sherwood on Saturday, giving him a one-stroke lead over Jon Rahm heading into Sunday.