Whincup and Waters go shoulder to shoulder