Thompson back on track in Diamond Race